Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

src/main/java/cn/hnthyy/thmz/entity/his/yp/YpZdDict.java

@@ -192,7 +192,7 @@ public class YpZdDict {
     private String spName;
     //抢救药品？
     private String qjFlag;
-    @NotColumn
+    //大输液基数标志
     private String jsFlag;
     //批准文号
     private String pzwh;

src/main/java/cn/hnthyy/thmz/entity/his/yz/YzYpZyOrder.java

@@ -64,7 +64,7 @@ public class YzYpZyOrder {
    */
   private String alwaysFlag;
   /**
-   * 0 已经发药或退药 1 初始值 2 拒绝发药 3 基数药 4 已发药
+   * 0 已经发药或退药 1 初始值 2 拒绝发药 3 基数药 4 已生成发药记录，药房未确认(大输液)
    */
   private String statusFlag;
   /**

src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfSpiritAnestheticPrintMapper.java

@@ -259,6 +259,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       a.order_no = g.order_no and" +
             "       a.item_no = g.item_no and" +
             "       g.supply_code = k.supply_code and" +
+            "       isnull(a.confirm_flag,2) != 2 and" +
             "       <when test='sendDrugRecordVo.beginDate != null'>" +
             "       a.confirm_time<![CDATA[>]]>#{sendDrugRecordVo.beginDate} and" +
             "       </when>" +

src/main/java/cn/hnthyy/thmz/mapper/his/zy/YpZyPatientMapper.java

@@ -180,7 +180,7 @@ public interface YpZyPatientMapper {
             "SELECT page_no,(case WHEN section_code is null or rtrim(section_code)='' THEN max(ward_code) else section_code end)as ward_code," +
                     "page_type as page_class,max(confirm_time)confirm_time," +
                     "max(drawer) as submit_name,max(keeper) as contirm_id  from yp_zy_patient WITH(NOLOCK)" +
-            " where group_no = #{groupNo} " +
+            " where group_no = #{groupNo} and confirm_time is not null" +
             "<when test='pageNo!=null'>",
             " and page_no =#{pageNo}",
             "</when>",

src/main/java/cn/hnthyy/thmz/vo/YpZdDictVo.java

@@ -146,6 +146,7 @@ public class YpZdDictVo {
     private String xtppName;
     private String spName;
     private String qjFlag;
+    //大输液基数标志
     private String jsFlag;
     private String pzwh;
     private String xnhCode;

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

@@ -1390,6 +1390,11 @@ function fitfymx(patientId, times, receiptNo, orderNo, groupNoOut) {
         },
         columns: [
             {
+                field: 'charge_item_code',
+                title: '编码',
+                align: "center",
+                valign: 'middle'
+            },{
                 field: 'drugname',
                 title: '品名',
                 align: "center",

src/main/resources/static/js/yf/ward_prescription.js

@@ -620,7 +620,7 @@ function initSummarizingTable() {
                 formatter: "select",
                 hidden: (pageClass === 'T' || groupNo === '81' || pageClass === 'HT') ? true : false,
                 edittype: "select",
-                editoptions: {value: "0:发药;1:暂缓;2:拒发"},
+                editoptions: (pageClass === '3' || pageClass === '4') ? {value: "0:发药;1:暂缓"} : {value: "0:发药;1:暂缓;2:拒发"},
                 formatter: function (cellvalue, options, rowObject) {
                     if (cellvalue == null || cellvalue == 0) {
                         return "<span style='color: green'>发药</span>"
@@ -862,7 +862,7 @@ function initDetailTable() {
                 formatter: "select",
                 hidden: (pageClass == 'T' || pageClass == 'HT') ? true : false,
                 edittype: "select",
-                editoptions: {value: "0:发药;1:暂缓;2:拒发"},
+                editoptions: (pageClass === '3' || pageClass === '4') ? {value: "0:发药;1:暂缓"} : {value: "0:发药;1:暂缓;2:拒发"},
                 formatter: function (cellvalue, options, rowObject) {
                     if (cellvalue == null || cellvalue == 0) {
                         return "<span style='color: green'>发药</span>"

src/main/resources/templates/yk/drug_info.html

@@ -408,8 +408,8 @@
                         <label class="form-check-label" for="zdcl">自动拆零</label>
                     </div>
                     <div class="col-md-1 col-sm-1 col-xs-12">
-                        <input class="form-check-input" type="checkbox" id="dsy" name="dsy" value="1">
-                        <label class="form-check-label" for="dsy">大输液基数</label>
+                        <input class="form-check-input" type="checkbox" id="jsFlag" name="jsFlag" value="1">
+                        <label class="form-check-label" for="jsFlag">大输液基数</label>
                     </div>
                     <div class="col-md-1 col-sm-1 col-xs-12">
                         <input class="form-check-input" type="checkbox" id="qjFlag" name="qjFlag" value="1">