1

tran-service/src/main/java/com/diagbot/mapper/DiseaseIcdMapper.java

@@ -24,7 +24,7 @@ public interface DiseaseIcdMapper extends BaseMapper<DiseaseIcd> {
      * @param map
      * @return
      */
-    public List<DiseaseIcd> getDiseaseIcds(Map map);
+    public List<GetDiseaseIcdDTO> getDiseaseIcds(Map map);
 
     public List<GetDiseaseNameDTO> getDiseaseNames(Map map);
 }

tran-service/src/main/java/com/diagbot/service/DiseaseIcdService.java

@@ -24,7 +24,7 @@ public interface DiseaseIcdService extends IService<DiseaseIcd> {
      * @param map
      * @return
      */
-    public List<DiseaseIcd> getDiseaseIcds(Map map);
+    public List<GetDiseaseIcdDTO> getDiseaseIcds(Map map);
 
     public List<GetDiseaseNameDTO> getDiseaseNames(Map map);
 

tran-service/src/main/java/com/diagbot/service/impl/DiseaseIcdServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.Map;
 public class DiseaseIcdServiceImpl extends ServiceImpl<DiseaseIcdMapper, DiseaseIcd> implements DiseaseIcdService {
 
     @Override
-    public List<DiseaseIcd> getDiseaseIcds(Map map) {
+    public List<GetDiseaseIcdDTO> getDiseaseIcds(Map map) {
         return baseMapper.getDiseaseIcds(map);
     }
 

tran-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -124,6 +124,4 @@ public class PatientInfoController {
         return RespDTO.onSuc(result);
     }
 
-}
-
 }

tran-service/src/main/java/com/diagbot/web/TranDiseaseIcdController.java

@@ -45,7 +45,7 @@ public class TranDiseaseIcdController {
     @SysLogger("getDiseaseIcds")
     @ApiIgnore
     public RespDTO<List<DiseaseIcd>> getDiseaseIcds(@RequestBody @Valid GetDiseaseIcdVO getDiseaseIcdVO) {
-        List<DiseaseIcd> data = diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO);
+        List<GetDiseaseIcdDTO> data = diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO);
         return RespDTO.onSuc(data);
     }
 

tran-service/src/main/resources/mapper/SysSetMapper.xml

@@ -23,7 +23,9 @@
         SELECT * FROM tran_sys_set
         <where>
             is_deleted = "N"
-            and FIND_IN_SET(#{hospitalCode},hospital_code)
+            <if test="hospitalCode != null and hospitalCode != '' ">
+                and hospital_code = #{hospitalCode}
+            </if>
             <if test="plan != null">
                 and plan = #{plan}
             </if>