疾病接口修改

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

@@ -28,10 +28,11 @@ public class SerDiseaseController {
      * @throws Exception
      */
     @PostMapping("disease/list")
-    @Token
+//    @Token
     @ApiOperation("根据疾病编码或者疾病等级查询疾病列表")
     public Object getDiseaseByLevel(@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
-        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDisease(),disease.getLevel());
+        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDisease(),
+                disease.getLevel(),disease.getDoctor(),disease.getDept());
         return Result.success(diseaseLevel);
     }
 

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

@@ -14,19 +14,22 @@ public interface SerDiseaseMapper {
 
     SerDisease selectByPrimaryKey(Long id);
 
-    SerDisease selectByCode(String code,String date);
+    SerDisease selectByCode(String code,String date,String docCode,String deptCode);
 
     List<SerDisease> selectAll();
 
     List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName);
 
-    List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level);
+    List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level,
+                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode);
 
-    List<DiseaseLevel> selectByParentId(@Param("date") String date,@Param("parentId") Integer parentId);
+    List<DiseaseLevel> selectByParentId(@Param("date") String date,@Param("parentId") Integer parentId,
+                                        @Param("docCode") String docCode,@Param("deptCode") String deptCode);
 
     DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
 
-    List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
+    List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId,
+                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode);
 
     int updateByPrimaryKey(SerDisease record);
 

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

@@ -16,9 +16,9 @@ public class Disease {
         private String disease;
         @ApiModelProperty(value = "等级",required = false)
         private Integer level;
-        @ApiModelProperty(value = "科室编码",required = false)
-        private String doctor;
         @ApiModelProperty(value = "医生编码",required = false)
+        private String doctor;
+        @ApiModelProperty(value = "科室编码",required = false)
         private String dept;
 
         public String getDate() {

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

@@ -15,12 +15,12 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     private SerDiseaseMapper serDiseaseMapper;
 
     @Override
-    public List<DiseaseLevel> selectListByIdorLevel(String date, String diseaseCode,Integer level){
+    public List<DiseaseLevel> selectListByIdorLevel(String date, String diseaseCode,Integer level,String docCode,String deptCode){
         List<DiseaseLevel> list = new ArrayList<>();
-        if(diseaseCode!=null){
-            list = selectById(date,diseaseCode);
+        if(diseaseCode!=null&&diseaseCode!=""){
+            list = selectByCode(date,diseaseCode,docCode,deptCode);
         }else{
-            list = selectByLevel(date,level);
+            list = selectByLevel(date,level,docCode,deptCode);
         }
         return list;
     }
@@ -31,13 +31,13 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     }
 
     /**
-     * 根据id查询父子级别列表
+     * 根据Code查询父子级别列表
      * @param date 时间
      * @param diseaseCode ID
      * @return
      */
-    private List<DiseaseLevel> selectById(String date, String diseaseCode){
-        SerDisease disease = serDiseaseMapper.selectByCode(diseaseCode,date);
+    private List<DiseaseLevel> selectByCode(String date, String diseaseCode,String docCode,String deptCode){
+        SerDisease disease = serDiseaseMapper.selectByCode(diseaseCode,date,docCode,deptCode);
         if(disease==null){
             return null;
         }
@@ -46,13 +46,13 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         List<DiseaseLevel> parentList = new ArrayList<>();
 
         //查询同级菜单列表
-        List<DiseaseLevel> serDiseaseList =  serDiseaseMapper.selectByParentId(date,disease.getParentId().intValue());
+        List<DiseaseLevel> serDiseaseList =  serDiseaseMapper.selectByParentId(date,disease.getParentId().intValue(),docCode,deptCode);
         List<DiseaseLevel> diseaseLevelList = new ArrayList<>();
         for (DiseaseLevel serDiseases: serDiseaseList) {
             DiseaseLevel diseaseLevel1 = new DiseaseLevel();
             //查询子级菜单列表
             if(serDiseases.getMdcCode().equals(diseaseCode)){
-                List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date,disease.getId().intValue());
+                List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date,disease.getId().intValue(),docCode,deptCode);
                 diseaseLevel1.setDiseaseLevelList(diseaseLevelList1);
             }
             diseaseLevel1.setDate(serDiseases.getDate());
@@ -81,10 +81,10 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
      * @param level
      * @return
      */
-    private List<DiseaseLevel> selectByLevel(String date, Integer level) {
+    private List<DiseaseLevel> selectByLevel(String date, Integer level,String docCode,String deptCode) {
         if(level==null){
             level=0;
         }
-        return serDiseaseMapper.selectByLevel(date,level);
+        return serDiseaseMapper.selectByLevel(date,level,docCode,deptCode);
     }
 }

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

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