Merge branch 'master' into text-ca

src/main/java/thyyxxk/webserver/dao/his/LoginDao.java

@@ -16,7 +16,7 @@ public interface LoginDao {
             "emp_tit_code " +
             "from dj_user_base a " +
             "         left join a_employee_mi b on (a.code = b.code)  " +
-            "where a.code_rs=#{codeRs} and a.del_flag=0")
+            "where a.code_rs=#{codeRs} and b.del_flag=0")
     UserInfo findUserByCodeRsFromDjUserBase(@Param("codeRs") String codeRs);
 
     @Select("select code, name, code_rs, password='e10adc3949ba59abbe56e057f20f883e',emp_tit_code " +

src/main/java/thyyxxk/webserver/entity/vo/DrgGroupTestVO.java

@@ -2,6 +2,9 @@ package thyyxxk.webserver.entity.vo;
 
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author:lihong drg测算调用诊断辅助填报vo
  * @Date: 2022/12/8
@@ -42,6 +45,10 @@ public class DrgGroupTestVO {
     private String jbdm13;    //其他诊断(13)
     private String jbdm14;    //其他诊断(14)
     private String jbdm15;    //其他诊断(15)
+    //其他诊断集合
+    private List<Map<String, Object>> qtzdList;
+    //其他手术
+    private List<Map<String, Object>> ssjczList;
     private String ssjczbm1;    //主要手术
     private String ssjczmc1;    //主要手术名称
     private String ssjczbm2;    //其他手术(1)

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

@@ -2104,17 +2104,43 @@ public class SetlListUpldService {
             drgGroupTestVO.setRybq(param.getNewYbZyDisDiag().get(0).getAdmissCond() == null ? "" : param.getNewYbZyDisDiag().get(0).getAdmissCond().toString());//入院病情
             drgGroupTestVO.setJbdm(param.getNewYbZyDisDiag().get(0).getDisDiag());
             drgGroupTestVO.setZyzd(param.getNewYbZyDisDiag().get(0).getDisDiagComment());
-            setFieldValue(drgGroupTestVO, "jbdm", "disDiag", param.getNewYbZyDisDiag(), 1, 16);
+            convertToQtzdList(CollUtil.sub(param.getNewYbZyDisDiag(),1,param.getNewYbZyDisDiag().size()), drgGroupTestVO);
+            //setFieldValue(drgGroupTestVO, "jbdm", "disDiag", param.getNewYbZyDisDiag(), 1, 16);
         }
         // 封装手术
         if (ListUtil.notBlank(param.getNewBatjBa4())) {
             drgGroupTestVO.setSsjczbm1(param.getNewBatjBa4().get(0).getSsbm());
             drgGroupTestVO.setSsjczmc1(param.getNewBatjBa4().get(0).getSsmc());
-            setFieldValue(drgGroupTestVO, "ssjczbm", "ssbm", param.getNewBatjBa4(), 2, 7);
+            convertToSsjczList(CollUtil.sub(param.getNewBatjBa4(),1,param.getNewBatjBa4().size()), drgGroupTestVO);
+            //setFieldValue(drgGroupTestVO, "ssjczbm", "ssbm", param.getNewBatjBa4(), 2, 7);
         }
         return drgGroupTestVO;
     }
 
+    private void convertToSsjczList(List<BatjBa4> newBatjBa4, DrgGroupTestVO drgGroupTestVO) {
+        if (CollUtil.isEmpty(newBatjBa4)) return;
+        List<Map<String, Object>> ssList = new ArrayList<>();
+        for(BatjBa4 item :newBatjBa4){
+            Map<String, Object> itemMap = new HashMap<>();
+            itemMap.put("ssjczbm", item.getSsbm());
+            itemMap.put("ssjczmc", item.getSsmc());
+            ssList.add(itemMap);
+        }
+        drgGroupTestVO.setSsjczList(ssList);
+    }
+
+    private void convertToQtzdList(List<YbZyDisDiag> ybZyDisDiagList, DrgGroupTestVO drgGroupTestVO) {
+        if (CollUtil.isEmpty(ybZyDisDiagList)) return;
+        List<Map<String, Object>> zdList = new ArrayList<>();
+        for(YbZyDisDiag item :ybZyDisDiagList){
+            Map<String, Object> itemMap = new HashMap<>();
+            itemMap.put("qtzddm", item.getDisDiag());
+            itemMap.put("qtzdmc", item.getDisDiagComment());
+            zdList.add(itemMap);
+        }
+        drgGroupTestVO.setQtzdList(zdList);
+    }
+
     private <T> void setFieldValue(DrgGroupTestVO drgGroupTestVO, String fieldName, String targetFieldName, List<T> classList, Integer initSize, int maxSize) {
         if (ListUtil.isBlank(classList)) return;
         if (initSize == null) {