Browse Source

对qc_type_id初始化流程进行梳理

liuqq 3 năm trước cách đây
mục cha
commit
f54cd74f89

+ 1 - 1
src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -133,7 +133,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 updateE.add(s);
             } else {
                 s.setGmtCreate(new Date());
-                s.setQcTypeId(initQcTypeId(s));
+                //s.setQcTypeId(initQcTypeId(s));
                 addE.add(s);
             }
         });

+ 9 - 13
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -578,25 +578,21 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 behDeptId = "52903";
             }
         }
-        List<QcType> qcTypeList = qcTypeFacade.list(new QueryWrapper<QcType>()
+        //根据性别和科室查看质控类型
+        QcType qcType= qcTypeFacade.getOne(new QueryWrapper<QcType>()
                 .eq("beh_dept_id", behDeptId)
+                .eq("default_module",0)
+                .eq("sex",behospitalInfo.getSex())
                 .eq("hospital_id", behospitalInfo.getHospitalId())
                 .eq("is_deleted", IsDeleteEnum.N));
-        if (qcTypeList.size() == 0) {
-            QcType qcType = qcTypeFacade.getOne(new QueryWrapper<QcType>()
+        if (qcType!=null) {
+            //如果没有则查看默认模板
+            QcType qcTypeD = qcTypeFacade.getOne(new QueryWrapper<QcType>()
                     .eq("default_module", 1)
                     .eq("hospital_id", behospitalInfo.getHospitalId())
                     .eq("is_deleted", IsDeleteEnum.N));
-            qcTypeId = qcType.getId();
-        } else if (qcTypeList.size() == 1) {
-            qcTypeId = qcTypeList.get(0).getId();
-        } else {
-            QcType qcType = new QcType();
-            qcTypeList.forEach(ss -> {
-                if (ss.getSex().equals(behospitalInfo.getSex())) {
-                    qcType.setId(ss.getId());
-                }
-            });
+            qcTypeId = qcTypeD.getId();
+        } else{
             qcTypeId = qcType.getId();
         }
         return qcTypeId;