解决科室为空的问题

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -555,15 +555,15 @@ public class MedicalViewApiController {
                 map.put("itemNumber", quantity.multiply(drugWin));
                 map.put("itemTotalFee", unitPrice.multiply(quantity).multiply(drugWin));
                 ZdUnitCode unitCode=unitCodeMap.get(mz.getExecDept());
-                if(unitCode==null){
+                if(unitCode==null && StringUtils.isNotBlank(mz.getExecDept())){
                     unitCode=zdUnitCodeService.queryByCode(mz.getExecDept());
                     unitCodeMap.put(mz.getExecDept(),unitCode);
                 }
                 if(mzBillItemMap!=null){
                     map.put("itemType", mzBillItemMap.get(mz.getBillItemCode()));
                 }
-                map.put("execDeptName", unitCode.getName());
-                map.put("execDeptAddress", unitCode.getOfficePos()==null?"":unitCode.getOfficePos());
+                map.put("execDeptName", unitCode==null?"":unitCode.getName());
+                map.put("execDeptAddress", (unitCode==null || unitCode.getOfficePos()==null)?"":unitCode.getOfficePos());
                 returnList.add(map);
             }
             results.put("resultCode", 0);

src/main/java/cn/hnthyy/thmz/service/impl/his/MzPatientMiServiceImpl.java

@@ -61,6 +61,9 @@ public class MzPatientMiServiceImpl implements MzPatientMiService {
     @Override
     public List<MzPatientMi> queryBySocialNo(String socialNo,String patientId) {
         try {
+            if("-".equals(socialNo)){
+                return null;
+            }
             return mzPatientMiMapper.selectBySocialNo(socialNo,patientId);
         }catch (Exception e){
             log.error("数据库异常，socialNo=【"+socialNo+"】，patientId=【"+patientId+"】");