Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/service/casefrontsheet/VerifyCaseFrontSheet.java

@@ -349,7 +349,7 @@ public class VerifyCaseFrontSheet {
             array.add(new CodeName("icuHours","患者ICU时间不能为空！"));
         }
         if (StringUtil.notBlank(info.getHasSurgery()) && hasSurgery(info.getHasSurgery()) &&
-                StringUtil.invalidValue(info.getSurgeryList().get(0).getName())) {
+                StringUtil.isBlank(info.getSurgeryList().get(0).getName())) {
             array.add(new CodeName("surgeryMain","患者有手术时，手术列表不能为空！"));
         }
         if (StringUtil.validValue(info.getAllergy())  && "2".equals(info.getAllergy()) && StringUtil.invalidValue(info.getAllergicMedicine())) {
@@ -358,7 +358,7 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.validValue(info.getPathologicDiagFee()) && StringUtil.invalidValue(info.getBlh())) {
             array.add(new CodeName("blh","患者有病理诊断费，病理号不能为空！"));
         }
-        if (hasSurgeryFee(info.getSurgeryFee()) && StringUtil.invalidValue(info.getSurgeryList().get(0).getName())) {
+        if (hasSurgeryFee(info.getSurgeryFee()) && StringUtil.isBlank(info.getSurgeryList().get(0).getName())) {
             array.add(new CodeName("surgeryMain","患者有手术费，手术列表不能为空！"));
         }
         if (needHurtReason(info.getDisdiagList().get(0).getCode()) &&

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiMzService.java

@@ -167,7 +167,6 @@ public class SiMzService {
         receipt.setQuantity(Double.valueOf(detail.get("quantity").toString()));
         receipt.setDrugWin((int) detail.get("drugWin"));
         receipt.setDoctorCode(detail.get("doctorCode").toString());
-        receipt.setSerialNo(detail.get("serialNo").toString());
         receipt.setGroupNo(detail.get("groupNo").toString());
         receipt.setChargeDate(detail.get("priceTime").toString().split("\\+")[0].replace("T", " "));
         receipt.setBillItemCode(detail.get("billItemCode").toString());
@@ -175,6 +174,9 @@ public class SiMzService {
         String table = receipt.getGroupNo().trim().equals("00") ? "zd_charge_item" : "yp_zd_dict";
         receipt.setNationalCode(dao.selectNationalCode(receipt.getChargeItemCode(), table));
         receipt.setChecked(StringUtil.notBlank(receipt.getNationalCode()));
+        if (null != detail.get("serialNo")) {
+            receipt.setSerialNo(detail.get("serialNo").toString());
+        }
         if (null != detail.get("instructionText")) {
             receipt.setInstructionText(detail.get("instructionText").toString());
         }