疾病接口模糊查询修改

bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java

@@ -40,7 +40,7 @@ public class SerDiseaseController {
     @Token
     @ApiOperation("根据疾病名称查询疾病信息")
     public  Object getDiseaseByMdcName(@RequestBody Disease.DiseaseName disease) throws InterruptedException {
-        List<SerDisease> list = serDiseaseService.selectByMdcName(disease.getDate(),disease.getMdcName());
+        List<SerDisease> list = serDiseaseService.selectByMdcName(disease.getDate(),disease.getMdcName(),disease.getDoctor(),disease.getDept());
         return Result.success(list);
     }
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseMapper.java

@@ -18,7 +18,8 @@ public interface SerDiseaseMapper {
 
     List<SerDisease> selectAll();
 
-    List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName);
+    List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName,
+                                     @Param("docCode") String docCode,@Param("deptCode")String deptCode);
 
     List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level,
                                      @Param("docCode") String docCode,@Param("deptCode") String deptCode);

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/Disease.java

@@ -85,6 +85,10 @@ public class Disease {
         private String date;
         @ApiModelProperty("疾病名称")
         private String mdcName;
+        @ApiModelProperty(value = "医生编码")
+        private String doctor;
+        @ApiModelProperty(value = "科室编码")
+        private String dept;
 
         public String getDate() {
             return date;
@@ -102,11 +106,29 @@ public class Disease {
             this.mdcName = mdcName;
         }
 
+        public String getDoctor() {
+            return doctor;
+        }
+
+        public void setDoctor(String doctor) {
+            this.doctor = doctor;
+        }
+
+        public String getDept() {
+            return dept;
+        }
+
+        public void setDept(String dept) {
+            this.dept = dept;
+        }
+
         @Override
         public String toString() {
             return "DiseaseName{" +
                     "date='" + date + '\'' +
                     ", mdcName='" + mdcName + '\'' +
+                    ", doctor='" + doctor + '\'' +
+                    ", dept='" + dept + '\'' +
                     '}';
         }
     }

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseServiceImpl.java

@@ -29,8 +29,8 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     }
 
     @Override
-    public List<SerDisease> selectByMdcName(String date, String mdcName) {
-        return serDiseaseMapper.selectByMdcName(date,mdcName);
+    public List<SerDisease> selectByMdcName(String date, String mdcName,String docCode,String deptCode) {
+        return serDiseaseMapper.selectByMdcName(date,mdcName,docCode,deptCode);
     }
 
     /**

bsoft-api/src/main/java/com/bsoft/api/service/SerDiseaseService.java

@@ -7,6 +7,6 @@ import java.util.List;
 
 public interface SerDiseaseService {
 
-    List<SerDisease> selectByMdcName(String date,String mdcName);
+    List<SerDisease> selectByMdcName(String date,String mdcName,String docCode,String deptCode);
     List<DiseaseLevel> selectListByIdorLevel(String date,String diseaseCode,Integer level,String docCode,String deptCode);
 }

bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml

@@ -79,16 +79,23 @@
     from SER_DISEASE
   </select>
   <select id="selectByMdcName" resultMap="BaseResultMap">
-    select ID, CREATE_DATE, CREATE_USERID, STATE, MDC_CODE, MDC_NAME, "DATE", MDC_NUM,
-    PARENT_ID,"LEVEL", ORG_ID, ORG_NAME
-    from SER_DISEASE
-	where 1 = 1 and STATE=1
-	<if test="date!=null">
-        and "DATE" = #{date,jdbcType=VARCHAR}
-    </if>
+      select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d."DATE",d.MDC_NUM,
+      d.PARENT_ID, d."LEVEL", d.ORG_ID, d.ORG_NAME
+      from SER_DISEASE d,SER_DISEASE_DOC_RS rs
+      where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
+      <if test="date!=null">
+          and d."DATE" = #{date,jdbcType=VARCHAR} and rs."DATE" = #{date,jdbcType=VARCHAR}
+      </if>
+      <if test="docCode!=null">
+          and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
+      </if>
+      <if test="deptCode!=null">
+          and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
+      </if>
       <if test="mdcName!=null">
-          and MDC_NAME like '%'||#{mdcName,jdbcType=VARCHAR}||'%'
+          and d.MDC_NAME like '%'||#{mdcName,jdbcType=VARCHAR}||'%'
       </if>
+      order by d.MDC_NUM
   </select>
   <select id="selectByLevel" resultMap="DiseaseLevel">
       select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d."DATE",d.MDC_NUM,