Преглед на файлове

Merge branch 'debug' of http://192.168.2.236:10080/gaodm/mrqc-sys into debug

songxinlu преди 4 години
родител
ревизия
d2e412365d
променени са 2 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 1 1
      src/main/java/com/diagbot/web/MedCheckWorkController.java
  2. 5 2
      src/main/resources/mapper/MedCheckInfoMapper.xml

+ 1 - 1
src/main/java/com/diagbot/web/MedCheckWorkController.java

@@ -53,7 +53,7 @@ public class MedCheckWorkController {
                     "level:病历等级<br>" +
                     "name:病人姓名<br>" +
                     "doctorName:医生姓名<br>" +
-                    "diagnosis:主诊断<br>" +
+                    "diagnose:主诊断<br>" +
                     "sDay:最小天数<br>" +
                     "lDay:最大天数<br>" +
                     "isPlacefile:是否归档<br>")

+ 5 - 2
src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -149,8 +149,11 @@
         <if test="endDate != null">
             <![CDATA[ AND mbi.behospital_date < #{endDate}]]>
         </if>
-        <if test="creatStatus != null and creatStatus != ''">
-            AND mci.create_status = #{creatStatus}
+        <if test="creatStatus != null and creatStatus == 1">
+            AND mci.job_create_time is not null
+        </if>
+        <if test="creatStatus != null and creatStatus == 0">
+            AND mci.job_create_time is null
         </if>
         <if test="name != null and name != ''">
             AND mbi.name like CONCAT('%',#{name},'%')