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

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

@@ -2347,7 +2347,15 @@ public class SetlListUpldService {
         }catch (Exception e){
 
         }
-
+        //出生日期
+        try {
+            if(StringUtil.notBlank(setlinfoUpld.getCertno())){
+                String format = cn.hutool.core.date.DateUtil.format(IdcardUtil.getBirthDate(setlinfoUpld.getCertno()), "yyyy-MM-dd");
+                setlinfoUpld.setBrdy(format);
+            }
+        }catch (Exception e){
+                log.error("e",e);
+        }
 
         //再31天再住院目的
         if("-".equals(setlinfoUpld.getDaysRinpPup31())){

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

@@ -91,9 +91,6 @@ public class SiMzService {
             if (null != hisOrdNum) {
                 String[] hisOrdNumParts = hisOrdNum.split("_");
                 int tempTimes = Integer.parseInt(hisOrdNumParts[1]);
-                if (null != p.getTimes() && (p.getTimes() != tempTimes)) {
-                    continue;
-                }
                 MzVisit mzVisit = dao.selectMzVisit(patNo, tempTimes);
                 if (null == mzVisit) {
                     continue;