Merge remote-tracking branch 'origin/dev-2.0-0126' into dev-2.0-security

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

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

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

@@ -16,7 +16,8 @@ public interface SerDiseaseMapper {
                             @Param("deptCode") String deptCode);
 
     List<DiseaseName> selectByMdcName(@Param("date") String date, @Param("mdcNameList") String[] mdcNameList,
-                                      @Param("hosCode") String hosCode, @Param("deptCode") String deptCode);
+                                      @Param("hosCode") String hosCode, @Param("deptCode") String deptCode,
+                                      @Param("deptCode") String medicalRecord);
 
     List<DiseaseLevel> selectByLevel(@Param("date") String date, @Param("level") Integer level,
                                      @Param("docCode") String docCode, @Param("deptCode") String deptCode,

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

@@ -88,6 +88,8 @@ public class Disease {
         private String doctor;
         @ApiModelProperty(value = "科室编码")
         private String dept;
+        @ApiModelProperty(value = "病案号")
+        private String medicalRecord;
 
         public String getDate() {
             return date;
@@ -121,6 +123,14 @@ public class Disease {
             this.dept = dept;
         }
 
+        public String getMedicalRecord() {
+            return medicalRecord;
+        }
+
+        public void setMedicalRecord(String medicalRecord) {
+            this.medicalRecord = medicalRecord;
+        }
+
         @Override
         public String toString() {
             return "DiseaseName{" +

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

@@ -54,7 +54,7 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     }
 
     @Override
-    public List<DiseaseName> selectByMdcName(Long userId, String date, String mdcName, String docCode, String deptCode) {
+    public List<DiseaseName> selectByMdcName(Long userId, String date, String mdcName, String docCode, String deptCode, String medicalRecord) {
         List<DicOrg> orgList = dicOrgMapper.selectByUser(userId);
         String orgCode = orgList != null && orgList.size() > 0 ? orgList.get(0).getOrgCode() : null;
 
@@ -65,7 +65,7 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         if (mdcName != null) {
             mdcNameList = mdcName.split("\\s+");
         }
-        List<DiseaseName> result = serDiseaseMapper.selectByMdcName(date, mdcNameList, orgCode, deptCode);
+        List<DiseaseName> result = serDiseaseMapper.selectByMdcName(date, mdcNameList, orgCode, deptCode, medicalRecord);
         return result;
     }
 

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

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

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

@@ -114,6 +114,15 @@
                 and INSTR(d.MDC_NAME,#{item,jdbcType=VARCHAR})>0
             </foreach>
         </if>
+        <if test="medicalRecord!=null">
+            AND d.MDC_CODE IN (
+            SELECT DISTINCT
+            ZBZBM
+            FROM
+            report_medical_record
+            WHERE
+            INHOS_NO = #{medicalRecord})
+        </if>
     </select>
     <select id="selectByLevel" resultMap="DiseaseLevel">
         select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,