代码优化

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzYjReqMapper.java

@@ -197,7 +197,7 @@ public interface MzYjReqMapper {
      */
     @Select({"<script>",
             "select count(*) count from mz_yj_req WITH(NOLOCK) where pay_mark='0' and status_flag <![CDATA[<>]]> 'z' ",
-            " and confirm_flag=1 ",
+            " and isnull(confirm_flag,1)=1 ",
             "<when test='reqType!=null'>",
             " and req_type =#{reqType} ",
             "</when>",
@@ -222,7 +222,7 @@ public interface MzYjReqMapper {
             "req_ward,exec_dept,req_date,inspect_part,inspect_stuff,sample_status,rtrim(print_flag) print_flag,rtrim(receive_flag) receive_flag,req_type,result_comment,sys_date,",
             "rtrim(pay_mark) pay_mark,rtrim(status_flag) status_flag,serial_no,cash_id,jy_remark,req_other_result,original_list_no,req_tz_comment,rtrim(jz_flag) jz_flag,req_studyid,",
             "percent_ft,rtrim(confirm_flag) confirm_flag,confirm_time,confirm_id,rtrim(print_flag_yj) print_flag_yj FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_yj_req_page.req_date desc) AS RowNumber,* from mz_yj_req mz_yj_req_page WITH(NOLOCK) where pay_mark='0' and status_flag <![CDATA[<>]]> 'z' ",
-            " and confirm_flag=1 ",
+            " and isnull(confirm_flag,1)=1 ",
             "<when test='reqType!=null'>",
             " and req_type =#{reqType} ",
             "</when>",

src/main/resources/static/js/mz/clinic.js

@@ -2292,7 +2292,7 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     var drugWin = $("#drugWin").val();
     //剂量单位
     var drugWinUnit = $('#drugWinUnit option:selected').text();
-    drugWinUnit = drugWinUnit.substring(0, drugWinUnit.indexOf("("));
+    //drugWinUnit = drugWinUnit.substring(0, drugWinUnit.indexOf("("));
     //天数
     var dayNum = $("#dayNum").val();
     //频次编码
@@ -2561,8 +2561,10 @@ function editWesternMedicine(obj) {
                 if (res.data != null) {
                     var drugWinHtml = '';
                     if (res.data.weight != null) {
-                        $("#drugWin").val(res.data.weight);
-                        $("#drugWinDb").val(res.data.weight);
+                        if ($("#drugWin").val() == null || $("#drugWin").val() == '') {
+                            $("#drugWin").val(res.data.weight);
+                            $("#drugWinDb").val(res.data.weight);
+                        }
                         drugWinHtml = '<option value="' + res.data.weighUnit + '" desc="' + res.data.weight + '">' + res.data.weighUnitDesc + '</option>';
                     }
                     if (res.data.volum != null) {