Merge branch 'master' into his/tzmh

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -127,18 +127,18 @@ public class ConsoleFacade {
         qcresultFilterVO.setLevel("丙");
         int qcresultByGradeType2AndLevel3Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
         if (qcresultFilterVO.getType().equals(1)) {
-            retMap.put("本月不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+            retMap.put("本月丙级病历-人工", qcresultByGradeType2AndLevel3Count);
         } else if (qcresultFilterVO.getType().equals(2)) {
-            retMap.put("本年不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+            retMap.put("本年丙级病历-人工", qcresultByGradeType2AndLevel3Count);
         }
         //本月乙级病历-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("丙");
         int qcresultByGradeType1AndLevel3Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
         if (filterVO.getType().equals(1)) {
-            retMap.put("本月不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+            retMap.put("本月丙级病历-机器", qcresultByGradeType1AndLevel3Count);
         } else if (filterVO.getType().equals(2)) {
-            retMap.put("本年不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+            retMap.put("本年丙级病历-机器", qcresultByGradeType1AndLevel3Count);
         }
         return retMap;
     }

src/main/java/com/diagbot/vo/BehospitalPageVO.java

@@ -66,4 +66,14 @@ public class BehospitalPageVO extends Page implements Serializable {
      */
     private String level;
 
+    /**
+     * 住院科室名称
+     */
+    private String behDeptName;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
 }

src/main/resources/application-pre.yml

@@ -156,7 +156,7 @@ io.github.lvyahui8.spring:
 
 myhost: localhost
 oath.self.address: http://${myhost}:${server.port}
-qc.address: http://192.168.2.232:6009
+qc.address: http://192.168.2.186:6009
 
 # 加解密开关
 encrypt:

src/main/resources/application-pro.yml

@@ -156,7 +156,7 @@ io.github.lvyahui8.spring:
 
 myhost: localhost
 oath.self.address: http://${myhost}:${server.port}
-qc.address: http://192.168.2.232:6009
+qc.address: http://192.168.2.123:6009
 
 # 加解密开关
 encrypt:

src/main/resources/application-test.yml

@@ -156,7 +156,7 @@ io.github.lvyahui8.spring:
 
 myhost: localhost
 oath.self.address: http://${myhost}:${server.port}
-qc.address: http://192.168.2.232:6009
+qc.address: http://192.168.2.241:6009
 
 # 加解密开关
 encrypt:

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -41,6 +41,12 @@
             on a.behospital_code = c.behospital_code and c.is_deleted = 'N'
         ) t
         where t.is_deleted = 'N'
+        <if test="behDeptName != null and behDeptName != ''">
+            and t.beh_dept_name like CONCAT('%',#{behDeptName},'%')
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            and t.doctor_name like CONCAT('%',#{doctorName},'%')
+        </if>
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')
         </if>