入院方式,联系人优化

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

@@ -590,8 +590,9 @@ public class SetlListUpldService {
             setlinfoUpld.setChfpdrName(StringUtil.isBlank(caseFrontsheetMain.getMainDoctorName()) ? caseFrontsheetMain.getAdmissDoctorName() : caseFrontsheetMain.getMainDoctorName());
             setlinfoUpld.setChfpdrCode(StringUtil.isBlank(getYbCode(caseFrontsheetMain.getMainDoctor())) ? getYbCode(caseFrontsheetMain.getAdmissDoctor()) : getYbCode(caseFrontsheetMain.getMainDoctor()));
             setlinfoUpld.setNwbAge(caseFrontsheetMain.getAgeDays() == null? "" : caseFrontsheetMain.getAgeDays().toString());
-            setlinfoUpld.setConerAddr(caseFrontsheetMain.getContactAddrName());
+            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());
             String dutyNurse = getYbCode(caseFrontsheetMain.getDutyNurse());
             if(StringUtil.notBlank(dutyNurse)){
                 setlinfoUpld.setRespNursCode(dutyNurse);