fix(#668): guanyu (文件合入)

healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml

@@ -97,10 +97,10 @@
                                     ON T4.med_req_id = T5.id
                                         AND T5.delete_flag = '0'
                    WHERE <if test="statusEnum == null">
-                            T4.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
+                            T4.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
                          </if>
                          <if test="statusEnum == 3">
-                             T4.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized})
+                             T4.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
                          </if>
                          <if test="statusEnum == 4">
                              T4.status_enum = #{completed}
@@ -108,9 +108,6 @@
                          <if test="statusEnum == 18">
                              T4.status_enum = #{submitted}
                          </if>
-                         <if test="statusEnum == 1">
-                             T4.status_enum = #{draft}
-                         </if>
         ) AS ii
         ${ew.customSqlSegment}
         GROUP BY ii.encounter_id,
@@ -271,10 +268,10 @@
         -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
         AND
         <if test="dispenseStatus == null">
-            T1.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
+            T1.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
         </if>
         <if test="dispenseStatus == 3">
-            T1.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized})
+            T1.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
         </if>
         <if test="dispenseStatus == 4">
             T1.status_enum = #{completed}
@@ -282,9 +279,6 @@
         <if test="dispenseStatus == 18">
             T1.status_enum = #{submitted}
         </if>
-        <if test="dispenseStatus == 1">
-            T1.status_enum = #{draft}
-        </if>
         AND T14.inventory_status_enum = #{active}
         ORDER BY prescription_no DESC
         ) AS ii