zhoutg пре 5 година
родитељ
комит
2f50222f05

+ 5 - 0
mrman-service/src/main/java/com/diagbot/dto/QcCasesEntrySimpleDTO.java

@@ -30,4 +30,9 @@ public class QcCasesEntrySimpleDTO {
      * modeName
      */
     private String modeName;
+
+    /**
+     * 是否勾选
+     */
+    private Integer sel;
 }

+ 1 - 0
mrman-service/src/main/java/com/diagbot/vo/QcTypeVO.java

@@ -12,4 +12,5 @@ import lombok.Setter;
 @Setter
 public class QcTypeVO {
     private Long id;
+    private Long hospitalId;
 }

+ 1 - 1
mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -130,7 +130,7 @@
     
     <select id="getEntryByHospital" resultType="com.diagbot.dto.QcCasesEntrySimpleDTO">
         SELECT
-            t1.`name`, t1.id, t3.`name` mode_name
+            t1.`name`, t1.id, t3.`name` mode_name, t2.is_used
         FROM
             qc_cases_entry t1,
             qc_cases_entry_hospital t2,

+ 35 - 19
mrman-service/src/main/resources/mapper/QcTypeCasesEntryMapper.xml

@@ -17,26 +17,42 @@
 
     <select id="getByTypeId" resultType="com.diagbot.dto.QcCasesEntrySimpleDTO">
         SELECT
-            t2.id, t2.name, t3.is_used, t5.name mode_name
+            a1.*,IF (a2.case_entry_id IS NULL,NULL,1) sel
         FROM
-            qc_type_cases_entry t1,
-            qc_cases_entry t2,
-            qc_cases_entry_hospital t3,
-            qc_type t4,
-						qc_mode t5
-        WHERE
-            t1.is_deleted = 'N'
-        AND t2.is_deleted = 'N'
-        AND t3.is_deleted = 'N'
-        AND t4.is_deleted = 'N'
-        AND t5.is_deleted = 'N'
-        AND t1.case_entry_id = t2.id
-        AND t2.id = t3.cases_entry_id
-        AND t3.hospital_id = t4.hospital_id
-        AND t1.type_id = t4.id
-		AND t2.mode_id = t5.id
-        AND t4.id = #{id}
-        ORDER BY t5.order_no, t2.order_no
+            (
+                SELECT
+                    t1.`name`,
+                    t1.id,
+                    t3.`name` mode_name,
+                    t2.is_used,
+                    t3.order_no mode_order,
+                    t1.order_no
+                FROM
+                    qc_cases_entry t1,
+                    qc_cases_entry_hospital t2,
+                    qc_mode t3
+                WHERE
+                    t1.is_deleted = 'N'
+                AND t2.is_deleted = 'N'
+                AND t3.is_deleted = 'N'
+                AND t1.id = t2.cases_entry_id
+                AND t1.mode_id = t3.id
+                AND t2.hospital_id = #{hospitalId}
+            ) a1
+        LEFT JOIN (
+            SELECT
+                q2.case_entry_id
+            FROM
+                qc_type q1,
+                qc_type_cases_entry q2
+            WHERE
+                q1.is_deleted = 'N'
+            AND q2.is_deleted = 'N'
+            AND q1.id = q2.type_id
+            AND q1.hospital_id = #{hospitalId}
+            AND q1.id = #{id}
+        ) a2 ON a1.id = a2.case_entry_id
+        ORDER BY a1.mode_order, a1.order_no
     </select>
 
 </mapper>