拼接数据

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -90,8 +90,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
     public Map<String, Object> analyze(AnalyzeVO analyzeVO) {
 
-        //        Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
-        Long hospitalId = 1L; // 写死
+        Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+//        Long hospitalId = 1L; // 写死
         analyzeVO.setHospitalId(hospitalId);
         // 获取质控条目
         List<QcCasesEntryDTO> qcCasesEntryDTOList = qcCasesEntryFacade.getQcCasesEntry(analyzeVO);
@@ -302,19 +302,19 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         MedrecVo medrecVo = new MedrecVo();
         medrecVo.setTitle(key);
 
-        Map<String, String> map = dicMap.get(2L); // 病案首页
+        Map<String, String> map = dicMap.get("2"); // 病案首页
         Map<String, Object> content = new HashMap<>();
         try {
             Map<String, Object> objectMap = MapUtil.objectToMap(homePage);
             for (String objKey : objectMap.keySet()) {
-                if (map.get(objKey) != null) {
+                if (map.containsKey(objKey)) {
                     content.put(map.get(objKey), String.valueOf(objectMap.get(objKey)));
                 }
             }
 
             // 病案首页手术信息
             if (ListUtil.isNotEmpty(homeOperationInfoList)) {
-                Map<String, String> dic3 = dicMap.get(3L); // 病案首页手术信息
+                Map<String, String> dic3 = dicMap.get("3"); // 病案首页手术信息
                 List<Map> mapList = new ArrayList<>();
                 for (HomeOperationInfo homeOperationInfo : homeOperationInfoList) {
                     try {
@@ -334,7 +334,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
             // 病案首页诊断信息
             if (ListUtil.isNotEmpty(homeDiagnoseInfoList)) {
-                Map<String, String> dic4 = dicMap.get(4L); // 病案首页诊断信息
+                Map<String, String> dic4 = dicMap.get("4"); // 病案首页诊断信息
                 List<Map> mapList = new ArrayList<>();
                 for (HomeDiagnoseInfo homeDiagnoseInfo : homeDiagnoseInfoList) {
                     try {

src/main/resources/mapper/MedicalRecordMapper.xml

@@ -25,8 +25,8 @@
             and a.hospital_id = #{hospitalId}
             and b.hospital_id = #{hospitalId}
             and a.behospital_code = #{behospitalCode}
-            and b.stand_model_name is not null) t left join med_medical_record_content c
-        on t.rec_id = c.rec_id and c.is_deleted = 'N'
+            and b.stand_model_name is not null) t, med_medical_record_content c
+        where t.rec_id = c.rec_id and c.is_deleted = 'N'
     </select>
 
 </mapper>