chengyao 3 лет назад
Родитель
Сommit
de5dba27bb

+ 2 - 0
src/main/java/com/diagbot/facade/BasDoctorInfoFacade.java

@@ -121,6 +121,8 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                 QueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
                 //QueryWrapper.eq("is_placefile", basDoctorInfoVO.getIsPlacefile());
                 QueryWrapper.in("beh_dept_id",deptSetInfo);
+                QueryWrapper.ne("qc_type_id",0);
+                QueryWrapper.eq("is_placefile",basDoctorInfoVO.getIsPlacefile());
 
                 if(StringUtils.isNotEmpty(basDoctorInfoVO.getInputStr())){
                     QueryWrapper.like("doctor_name",basDoctorInfoVO.getInputStr());

+ 0 - 3
src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -977,9 +977,6 @@ public class ConsoleByDeptFacade {
     }
 
     public static void strTrans(ReBeHosMergeDTO record) {
-        if(StringUtils.isNotBlank(record.getDiffDays()) && "0".equals(record.getDiffDays())){
-            record.setDiffDays("-");
-        }
         String replace = record.getLastAgainBehospitalPlan();
         if(StringUtils.isEmpty(replace)){
             replace = "否";

+ 4 - 0
src/main/java/com/diagbot/vo/data/BasDoctorInfoVO.java

@@ -17,6 +17,10 @@ public class BasDoctorInfoVO {
      */
     private String inputStr;
     private String deptName = "";
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
     @ApiModelProperty(hidden = true)
     private String deptId;
     @ApiModelProperty(hidden = true)

+ 1 - 0
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -7003,6 +7003,7 @@
         GROUP BY
         b.doctor_id,
         b.doctor_name
+        having  sum(c.cases_entry_id = 2495) is not null
         ) UNION
         (
         SELECT