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

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

@@ -562,7 +562,7 @@ public class SetlListUpldService {
         if(patientInfo.getData() !=null){
             CaseFrontsheetMain caseFrontsheetMain = patientInfo.getData();
             setlinfoUpld.setNtly(caseFrontsheetMain.getCountry()!=null ? dao.getCountrySiCode(caseFrontsheetMain.getCountry()):null);
-            setlinfoUpld.setPrfs(caseFrontsheetMain.getOccupation());
+            setlinfoUpld.setPrfs(StringUtil.isBlank(caseFrontsheetMain.getOccupation()) ? getPrfs(setlinfoUpld):caseFrontsheetMain.getOccupation());
             setlinfoUpld.setCertno(caseFrontsheetMain.getSocialNo());
             setlinfoUpld.setCurrAddr(caseFrontsheetMain.getLivePlace());
             setlinfoUpld.setEmpName(caseFrontsheetMain.getUnitName());
@@ -605,6 +605,14 @@ public class SetlListUpldService {
         }
 
     }
+    //获取职业
+    private String getPrfs(SetlinfoUpld setlinfoUpld) {
+        if("310".equals(setlinfoUpld.getHiType())){
+            return "17";
+        }else {
+            return "90";
+        }
+    }
 
     public String getYbCode(String code) {
         UserInfo userInfo = redisLikeService.getUserInfoByCode(code);