优化

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

@@ -508,9 +508,15 @@ public class Constants {
 
 
     /**
-     * 简易门诊编码
+     * 简易门诊编码(特门)
      */
     public static final String SIMPLE_OUTPATIENT_CODE = "10";
+
+    /**
+     * GPC实验类别编码
+     */
+    public static final String GPC_CODE = "45";
+
     /**
      * 复诊编码
      */

src/main/java/cn/hnthyy/thmz/controller/CommonController.java

@@ -415,6 +415,31 @@ public class CommonController {
             return resultMap;
         }
     }
+    /**
+     * @description: 查询入院途径
+     * @author: lihong
+     * @date: 2024/4/18 11:02
+     * @return: cn.hnthyy.thmz.Utils.R
+     **/
+    @UserLoginToken
+    @GetMapping("/queryRouteOfAdmission")
+    public R queryRouteOfAdmission() {
+        List<Map<String, Object>> data = mzZdCommonService.queryRouteOfAdmission();
+        return R.ok().put("data", data);
+    }
+
+    /**
+     * @description: 查询处方类型字典
+     * @author: lihong
+     * @date: 2024/4/18 15:55
+     * @return: cn.hnthyy.thmz.Utils.R
+     **/
+    @UserLoginToken
+    @GetMapping("/queryMzOrderType")
+    public R queryMzOrderType() {
+        List<Map<String, Object>> data = mzZdCommonService.queryMzOrderType();
+        return R.ok().put("data", data);
+    }
 
 
     /**

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 public interface MzZdCommonMapper {
     /**
@@ -105,4 +106,8 @@ public interface MzZdCommonMapper {
      */
     @Select("select rtrim(code) code,rtrim(name) name, rtrim(py_code) py_code from jy_zd_tube WITH(NOLOCK) ")
     List<CodeNameEntity> selectAllJyZdTube();
+    @Select(" select rtrim(code) code , rtrim(name) name  from  zy_zd_admiss_way ")
+    List<Map<String, Object>> selectRouteOfAdmission();
+    @Select(" select rtrim(code) code,rtrim(name) name from mz_zd_order_type where del_flag = '0' ")
+    List<Map<String, Object>> selectMzZdOrderType();
 }

src/main/java/cn/hnthyy/thmz/service/his/mz/MzZdCommonService.java

@@ -3,6 +3,7 @@ package cn.hnthyy.thmz.service.his.mz;
 import cn.hnthyy.thmz.entity.his.mz.CodeNameEntity;
 
 import java.util.List;
+import java.util.Map;
 
 public interface MzZdCommonService {
     /**
@@ -92,5 +93,18 @@ public interface MzZdCommonService {
      * @return
      */
     List<CodeNameEntity> queryAllJyZdTube();
-
+    /**
+     * @description: 查询入院途径
+     * @author: lihong
+     * @date: 2024/4/18 10:34
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    List<Map<String, Object>> queryRouteOfAdmission();
+    /**
+     * @description: 查询处方类型字典
+     * @author: lihong
+     * @date: 2024/4/18 15:52
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    List<Map<String, Object>> queryMzOrderType();
 }

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

@@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+
 @Service
 public class MzZdCommonServiceImpl implements MzZdCommonService {
     @SuppressWarnings("all")
@@ -76,4 +78,26 @@ public class MzZdCommonServiceImpl implements MzZdCommonService {
     public List<CodeNameEntity> queryAllJyZdTube() {
         return zdCommonMapper.selectAllJyZdTube();
     }
+
+    /**
+     * @description: 查询入院途径
+     * @author: lihong
+     * @date: 2024/4/18 10:34
+     * @return: java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     **/
+    @Override
+    public List<Map<String, Object>> queryRouteOfAdmission() {
+        return zdCommonMapper.selectRouteOfAdmission();
+    }
+
+    /**
+     * @description: 查询处方类型字典
+     * @author: lihong
+     * @date: 2024/4/18 15:52
+     * @return: java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     **/
+    @Override
+    public List<Map<String, Object>> queryMzOrderType() {
+        return zdCommonMapper.selectMzZdOrderType();
+    }
 }

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

@@ -266,6 +266,8 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
             clinicStatus = ClinicStatusEnum.REGISTRATION.code;
             mzfzPatientOrderMapper.insertMzfzPatientOrder(mzfzPatientOrder);
         }
+        //保存处方类型
+
         Clinic clinic = new Clinic();
         clinic.setPatientId(mzyReqrec.getPatientId());
         clinic.setPatientName(mzfzPatientOrder.getName());

src/main/resources/application-dev.yml

@@ -213,7 +213,7 @@ rationalUseOfMedicineUrl: "http://172.16.32.121:8016/Audit.ashx"
 misPossUrl:  "http://172.16.32.201:8080/ccbmis/transaction/"
 
 #pacs检查地址
-pacsUrl: http://172.16.32.122:8081/
+pacsUrl: http://172.16.32.122:8099
 
 #健康宣教
 healthEducationUrl: https://staticweb.hnthyy.cn/healthEducation

src/main/resources/application-prod.yml

@@ -208,7 +208,7 @@ misPossUrl: "http://172.16.32.201:8080/ccbmis/transaction/"
 #健康宣教
 healthEducationUrl: https://staticweb.hnthyy.cn/healthEducation
 #pacs检查地址
-pacsUrl: http://172.16.32.122:8081/
+pacsUrl: http://172.16.32.122:8099
 #微信支付链接
 wxPayQrUrl: https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbde6b16acad84204&redirect_uri=http://staticweb.hnthyy.cn/wxserver/redirect/page2?to=fromGuideBillQrScan_patientId&response_type=code&scope=snsapi_base&state=1#wechat_redirect
 

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

@@ -173,7 +173,7 @@ function initDeptSelect() {
                 window.location.href = '/thmz/login/view'
                 return;
             }
-            var html = '';
+            let html = '';
             $.each(data.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
             });
@@ -373,9 +373,28 @@ function initZySelect() {
     $('#conditionCode').selectpicker('refresh');
 
     //入院途径
-    var routeOfAdmission = '<option value="1">急诊</option><option value="2">门诊</option><option value="3">其他医疗机构转入</option><option value="9">其他</option>';
-    $('#routeOfAdmission').html(routeOfAdmission);
-    $('#routeOfAdmission').selectpicker('refresh');
+    initRouteOfAdmission()
+}
+
+
+/**
+ * 初始化入院途径
+ */
+function initRouteOfAdmission() {
+    getAjaxRequst("/thmz/queryRouteOfAdmission",{},true,function (res) {
+        if (res == '401' || res == 401) {
+            window.location.href = '/thmz/login/view'
+            return;
+        }
+
+        let html = '';
+        $.each(res.data, function (commentIndex, comment) {
+            html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+        });
+        $('#routeOfAdmission').empty();
+        $('#routeOfAdmission').html(html);
+        $('#routeOfAdmission').selectpicker('refresh');
+    })
 }
 
 
@@ -393,13 +412,13 @@ function iniAdmissStatus() {
                 window.location.href = '/thmz/login/view'
                 return;
             }
-            var html = '';
+            let html = '';
             $.each(res.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.code + '">' + comment.name + '</option>';
             });
             $('#admissStatus').empty();
             $('#admissStatus').html(html);
-            $('#admissStatus').selectpicker('destroy').selectpicker('refresh');
+            $('#admissStatus').selectpicker('refresh');
         }
     });
 }

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

@@ -26,7 +26,7 @@ var tableIdAndOrderNoMap = null;
 var getResultUrl = null;
 //定时器
 var timer;
-
+var ksjzType = null;
 
 $(function () {
     initGenderSelect();
@@ -862,6 +862,7 @@ $(function () {
      */
     $("#rapidAcceptsEditUser").on("click", function (t) {
         editUserModal($("#rapidAcceptsUserCode").val(), 2);
+        ksjzType = 2 ;
     });
 
 
@@ -3849,10 +3850,7 @@ function initGenderSelect() {
     $('#conditionCode').selectpicker('refresh');
 
     //入院途径
-    var routeOfAdmission = '<option value="1">急诊</option><option value="2">门诊</option><option value="3">其他医疗机构转入</option><option value="9">其他</option>';
-    $('#routeOfAdmission').html(routeOfAdmission);
-    $('#routeOfAdmission').selectpicker('refresh');
-
+   initRouteOfAdmission()
 
     //就诊人群类型
     var mdtrtGrpType = '<option value="-1">无</option><option value="1">新冠肺炎确诊患者</option><option value="2">其他国家突发公共事件</option><option value="3">新冠肺炎疑似患者</option><option value="4">无症状感染者</option>';
@@ -3963,6 +3961,25 @@ function iniAdmissStatus() {
     });
 }
 
+/**
+ * 初始化入院途径
+ */
+function initRouteOfAdmission() {
+    getAjaxRequst("/thmz/queryRouteOfAdmission",{},true,function (res) {
+        if (res == '401' || res == 401) {
+            window.location.href = '/thmz/login/view'
+            return;
+        }
+
+        var html = '';
+        $.each(res.data, function (commentIndex, comment) {
+            html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+        });
+        $('#routeOfAdmission').empty();
+        $('#routeOfAdmission').html(html);
+        $('#routeOfAdmission').selectpicker('destroy').selectpicker('refresh');
+    })
+}
 
 /**
  * 入院登记的病区列表
@@ -8764,8 +8781,17 @@ function modifyPatient() {
             if (res.code == 0) {
                 $('#editUserModal').modal('hide');
                 var patientId = $("#patientId").text();
-                if (patientId != null && patientId != 'null' && patientId != "") {
+                let tempMzfzSerialNo = $("#mzfzSerialNoInClick").val();
+                if (patientId != null && patientId != 'null' && patientId != "" && tempMzfzSerialNo.indexOf("clnicId_") < 0 ) {
                     realClinicalReception(patientId, $("#mzfzSerialNoInClick").val(), $("#mzfzReqTypeNoInClick").val());
+                } else {
+                    if(ksjzType == 2){
+                        let tempPatientId = $("#editUserCode").val();
+                        clearRapidAccepts();
+                        $("#rapidAcceptsUserCardNo").val(tempPatientId);
+                        queryUserInfoByCardNo();
+                        ksjzType = null;
+                    }
                 }
                 clearPlusPatinet();
             } else {
@@ -8776,11 +8802,13 @@ function modifyPatient() {
 }
 
 
+
 /**
  * 将病人信息修改域置空
  * @param patinet
  */
 function clearPlusPatinet() {
+    ksjzType = null;
     $("#editUserCode").val(null);
     $("#editUserName").val(null);
     $("#editUserAge").val(null);
@@ -13790,7 +13818,7 @@ function openPacsJc() {
         }
         if(res.code == 0 ){
             let patientId = $("#patientId").text();
-            let pacsurl =  res.data +"Clinical?clinicalNum="+patientId
+            let pacsurl =  res.data +"/Index.htm?CLINICALNUM="+patientId
             window.open(pacsurl, '_blank');
         }else {
             errorMesage(res)

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

@@ -1017,7 +1017,7 @@ function openPacsUrl() {
             return;
         }
         if(res.code == 0 ){
-           let pacsurl =  res.data +"Clinical"
+           let pacsurl =  res.data
             window.open(pacsurl, '_blank');
         }else {
             errorMesage(res)