分组优化

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

@@ -551,6 +551,7 @@ public class SetlListUpldService {
             setlinfoUpld.setConerAddr(StringUtil.isBlank(caseFrontsheetMain.getContactAddrName()) ? caseFrontsheetMain.getLivePlace() : caseFrontsheetMain.getContactAddrName());
             setlinfoUpld.setNwbBirWt(caseFrontsheetMain.getNewBornWeight() == null ? "" : caseFrontsheetMain.getNewBornWeight().toString());
             setlinfoUpld.setAdmWay(StringUtil.isBlank(setlinfoUpld.getAdmWay())  ? StringUtil.isBlank(caseFrontsheetMain.getZyAdmissWay()) ? "2": caseFrontsheetMain.getZyAdmissWay(): setlinfoUpld.getAdmWay());
+            setlinfoUpld.setNwbAdmWt(Convert.toStr(caseFrontsheetMain.getNewBornAdmissWeight(),""));
             String dutyNurse = getYbCode(caseFrontsheetMain.getDutyNurse());
             if(StringUtil.notBlank(dutyNurse)){
                 setlinfoUpld.setRespNursCode(dutyNurse);
@@ -1448,15 +1449,17 @@ public class SetlListUpldService {
 
     private void setDrgInfo(ZyInactpatient zy,Date admTime,String patNo, Integer times, Integer ledgerSn) {
         SiSetlinfoTemp siSetlinfoTemp = dao.getJieSuanDetail(patNo, times, ledgerSn);
+        SetlinfoUpld setlinfoUpld = new SetlinfoUpld();
+        dealSetlinfoUpld(patNo,times,setlinfoUpld);
         BaseInfo bf = new BaseInfo();
         String visitId = StrUtil.format("{}_{}_{}",patNo,times,ledgerSn);
         bf.setVisitId(visitId)
                 .setGend(siSetlinfoTemp.getGend())
                 .setBrdy(DateUtil.formatDatetime(siSetlinfoTemp.getBrdy(),"yyyy-MM-dd"))
                 .setAge(siSetlinfoTemp.getAge()==null ? "" : String.valueOf(siSetlinfoTemp.getAge().intValue()))
-                .setNwbAge("")
-                .setNwbBirWt("")
-                .setNwbAdmWt("")
+                .setNwbAge(setlinfoUpld.getNwbAge())
+                .setNwbBirWt(setlinfoUpld.getNwbBirWt())
+                .setNwbAdmWt(setlinfoUpld.getNwbAdmWt())
                 .setAdmTime(admTime)
                 .setActIptDays(siSetlinfoTemp.getActIptDays())
                 .setTotalFee(siSetlinfoTemp.getMedfeeSumamt())