lihong 2 лет назад
Родитель
Сommit
78d8b67b33

+ 4 - 0
src/main/java/cn/hnthyy/thmz/common/Constants.java

@@ -478,6 +478,10 @@ public class Constants {
      * 简易门诊编码
      */
     public static final String SIMPLE_OUTPATIENT_CODE = "10";
+    /**
+     * 复诊编码
+     */
+    public static final String FZ_CODE = "11";
 
     /**
      * 免挂号编码

+ 2 - 2
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzfzPatientOrderMapper.java

@@ -186,8 +186,8 @@ public interface MzfzPatientOrderMapper {
      * @return
      */
     @Select({"<script>",
-            "select * from mzfz_patient_order WITH(NOLOCK) where patient_id = #{patientId} and ((status_flag in (0,1,2,3,8) and (doctor_code=#{userIdCode} or req_type in('11', '16')  ",
-            //"select * from mzfz_patient_order WITH(NOLOCK) where patient_id = #{patientId} and ((status_flag in (0,1,2,3,8) and (doctor_code=#{userIdCode} or req_type ='16' ",
+            //"select * from mzfz_patient_order WITH(NOLOCK) where patient_id = #{patientId} and ((status_flag in (0,1,2,3,8) and (doctor_code=#{userIdCode} or req_type in('11', '16')  ",
+            "select * from mzfz_patient_order WITH(NOLOCK) where patient_id = #{patientId} and ((status_flag in (0,1,2,3,8) and (doctor_code=#{userIdCode} or req_type ='16' ",
             " or (dept_code in ",
             "<foreach item='item' index='index' collection='deptNos' open='(' separator=',' close=')'>",
             "#{item}",

+ 5 - 5
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzfzPatientOrderServiceImpl.java

@@ -54,11 +54,11 @@ public class MzfzPatientOrderServiceImpl implements MzfzPatientOrderService {
         }
         //deptNos.add(Constants.JY_EXEC_CODE);
         List<String> reqTypes=mzyZdChargeTypeMapper.selectCodesByReqType(Constants.JZ_CODE);
-        //if(reqTypes==null){
-        //    reqTypes=Arrays.asList(Constants.SIMPLE_OUTPATIENT_CODE);
-        //}else {
-        //    reqTypes.add(Constants.SIMPLE_OUTPATIENT_CODE);
-        //}
+        if(reqTypes==null){
+            reqTypes=Arrays.asList(Constants.FZ_CODE);
+        }else {
+            reqTypes.add(Constants.FZ_CODE);
+        }
         return mzfzPatientOrderMapper.selectByPatientId(patientId, deptNos,userIdCode,reqTypes);
     }