1.修正住院登记修改界面-缴押金无票据报null问题

WEB-INF/src/com/his/zy/zyyjmanage/ZyhzDepositWindow.java

@@ -2,7 +2,6 @@ package com.his.zy.zyyjmanage;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import com.his.pjgl.PiaojuSkipNumberWindow;
 import com.his.pjgl.mapper.PjCurrUseNoDaoMapper;
 import com.his.pjgl.util.PiaojuUseUtil;
@@ -11,9 +10,9 @@ import com.his.zy.service.ZyYjService;
 import com.his.zy.zydjmanage.model.ZyNormalModel;
 import com.his.zy.zyyjmanage.model.ZyYjModel;
 import com.report.design.basic.ReportDesignUtil.PrintFlag;
-import com.util.MainUtil;
 import com.report.model.ZyyjPrintModel;
 import com.report.service.ZyyjPrintService;
+import com.util.MainUtil;
 import com.wat.component.DxDataDateTimePick;
 import com.wat.component.DxDataLookUpComboBox;
 import com.wat.component.DxLabel;
@@ -308,7 +307,7 @@ public class ZyhzDepositWindow extends WatSDIWindow {
 	private boolean initPj() {
 		boolean result = false;
 		PjCurrUseNoDaoMapper pjMapper = PiaojuUseUtil.getCanUserPjNo(MainUtil.getCurUserAccount(),"S", "ZY");
-		if(pjMapper.getRowCount() == 0) {
+		if(pjMapper==null||pjMapper.getRowCount() == 0) {
 			setLabelShow("提示:当前无可用票据,不能进行交押金");
 			panelBar8.setPanelButtonVisible("jyj",false);
 		}else{