开药时间选择药房

src/main/java/cn/hnthyy/thmz/common/Constants.java

@@ -364,10 +364,16 @@ public class Constants {
      */
     public static final String XY_ZCY_GROUP_NO = "71";
 
+    /**
+     * 西药和中成药的药品组
+     */
+    public static final String XY_MZ_GROUP_NO = "81";
+
+
     /**
      * 中草药药的药品组
      */
-    public static final String ZY_GROUP_NO = "81";
+    public static final String ZY_GROUP_NO = "82";
 
     /**
      * 颗粒剂中药药品组

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -2043,7 +2043,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         }
                         detail.add(zlDetail);
                     }
-                } else if (Constants.XY_ZCY_GROUP_NO.equals(mzChargeDetail.getGroupNo()) || Constants.YC_GROUP_NO.equals(mzChargeDetail.getGroupNo())) {
+                } else if (Constants.XY_ZCY_GROUP_NO.equals(mzChargeDetail.getGroupNo()) || Constants.XY_MZ_GROUP_NO.equals(mzChargeDetail.getGroupNo()) || Constants.YC_GROUP_NO.equals(mzChargeDetail.getGroupNo())) {
                     YpZdDict ypZdDict = ypZdDictService.queryYpZdDictByCodeAndSerial(mzChargeDetail.getChargeItemCode(), mzChargeDetail.getSerial());
                     if (ypZdDict == null) {
                         continue;
@@ -2055,7 +2055,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         xyDetailMap.put("amount", BigDecimal.ZERO);
                         xyDetailMap.put("detail", new ArrayList<>());
                         xyMap.put(mzChargeDetail.getOrderNo(), xyDetailMap);
-                        if (Constants.XY_ZCY_GROUP_NO.equals(mzChargeDetail.getGroupNo())) {
+                        if (Constants.XY_ZCY_GROUP_NO.equals(mzChargeDetail.getGroupNo()) || Constants.XY_MZ_GROUP_NO.equals(mzChargeDetail.getGroupNo())) {
                             if (mjySet != null && mjySet.contains(mzChargeDetail.getChargeItemCode().trim())) {
                                 //麻精处方
                                 mjPrescription.add(xyDetailMap);

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

@@ -30,6 +30,9 @@ var ksjzType = null;
 var hospitalName='沭阳铭和医院'
 var wpyHide = 0;
 
+//药房信息
+var groupNoList = []
+
 var currentPatientId = '';
 //就诊病人信息
 var currentPatientInfo = {} ;
@@ -1802,6 +1805,7 @@ function refreshClinic() {
 function loadClinicTableList() {
     //loadCommonClinicTableList("tb_table_clinic","/thmz/getClinicWithPage");
     loadCommonClinicTableList("tb_table_clinic", queryParamsClinic);
+    initZyClassTypeSelect()
 }
 
 
@@ -4558,6 +4562,7 @@ function initZyClassTypeSelect() {
     getAjaxRequst("/thmz/selectYfAllByTime",{},true,function (res) {
         let html = '';
         $.each(res.data, function (commentIndex, comment) {
+            groupNoList = res.data
             if(comment.mzFlag ==='1' && (comment.zcyFlag==='1' || comment.klFlag==='1')){
                 html += '<option value="' + comment.groupNo + '">' + comment.groupName + '</option>';
             }
@@ -8371,6 +8376,7 @@ function loadYpList(index, event) {
     // }
     $('#' + MedicineName).webuiPopover('show');
     $('#' + tableMedicine).bootstrapTable('refresh');
+
     $('#' + tableMedicine).bootstrapTable({
         url: '/thmz/getYpListByCommonParams',         //请求后台的URL（*）
         method: 'GET',                      //请求方式（*）
@@ -8383,7 +8389,12 @@ function loadYpList(index, event) {
         queryParams: function (params) {
             var groupNo = null;
             if (index == 0) {
-                groupNo = 71;
+                groupNoListMz = groupNoList.filter((ere)=>{
+                    return "1" == ere.mzFlag && "1" == ere.xyFlag
+                })
+
+//                console.log("groupNoListMz",groupNoListMz[0].groupNo)
+                groupNo = groupNoListMz[0].groupNo;
             }
             if (index == 1) {
                 groupNo = $("#zyClassType").val();