标准对接修改

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -12,21 +12,27 @@ import com.diagbot.facade.BasHospitalInfoFacade;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
 import com.diagbot.facade.QcTypeFacade;
+import com.diagbot.service.MedicalRecordService;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EncrypDES;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.ReadProperties;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.MedrecVo;
 import com.diagbot.vo.QueryVo;
 import com.diagbot.vo.data.AColumnContentVO;
+import com.diagbot.vo.data.AMedicalRecordContentVO;
 import com.diagbot.vo.data.AMedicalRecordVO;
 import com.diagbot.vo.data.AMrContentVO;
+import com.diagbot.vo.data.HisDataDealVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -66,6 +72,9 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     @Autowired
     private BasHospitalInfoFacade basHospitalInfoFacade;
 
+    @Value("${encrypt.enable}")
+    Boolean encryptFlag;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -113,6 +122,46 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
     }
 
+    public boolean hisDataDeal(HisDataDealVO hisDataDealVO){
+        QueryWrapper<MedicalRecord> medicalRecordQe = new QueryWrapper<>();
+        medicalRecordQe.eq("hospital_id", hisDataDealVO.getHospitalId());
+        medicalRecordQe.eq("mode_id", hisDataDealVO.getModeId());
+        List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
+        medicalRecordList.forEach(medicalRecord -> {
+            QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
+            medicalRecordContentQe.eq("hospital_id", hisDataDealVO.getHospitalId());
+            medicalRecordContentQe.eq("rec_id", medicalRecord.getRecId());
+            List<MedicalRecordContent> medicalRecordContentList = aMedicalRecordContentFacade.list(medicalRecordContentQe);
+
+            if (ListUtil.isEmpty(medicalRecordContentList)){
+                return;
+            }
+
+            if (encryptFlag) {
+                try {
+                    EncrypDES encrypDES = new EncrypDES();
+                    for (MedicalRecordContent mrj : medicalRecordContentList) {
+                        mrj.setXmlText(encrypDES.decryptor(mrj.getXmlText()));
+                    }
+                } catch (Exception e) {
+                    return;
+                }
+            }
+
+            List<AMedicalRecordContentVO> contents = BeanUtil.listCopyTo(medicalRecordContentList, AMedicalRecordContentVO.class);
+            AMedicalRecordVO aMedicalRecordVO = new AMedicalRecordVO();
+            BeanUtil.copyProperties(medicalRecord, aMedicalRecordVO);
+            aMedicalRecordVO.setContents(contents);
+
+            List<AMedicalRecordVO> records = Lists.newArrayList();
+            records.add(aMedicalRecordVO);
+            AMrContentVO aMrContentVO = new AMrContentVO();
+            aMrContentVO.setRecords(records);
+            splicingParam(aMrContentVO);
+        });
+        return true;
+    }
+
     /**
      * 入参结构拼接-仅支持接口对接的方式
      * @param aMrContentVO

src/main/java/com/diagbot/facade/data/ColumnFacade.java

@@ -33,7 +33,7 @@ public class ColumnFacade extends ColumnServiceImpl {
             if(resp.getData()!=null && resp.getData().getPageData()!=null){
                 Map<String, Object> pageData=resp.getData().getPageData();
                 pageData.forEach((key,value)->{
-                    List<Map<String, Object>> listMap=(List<Map<String,Object>>)resp.getData().getPageData().get(CacheKeyEnum.getName(key));
+                    List<Map<String, Object>> listMap=(List<Map<String,Object>>)resp.getData().getPageData().get(key);
                     Map<String, String> columnMap=this.getColumn(CacheKeyEnum.getName(key));
                     Map<String, Object> entityMap=new HashMap<String, Object>();
                     listMap.forEach(s->{
@@ -42,7 +42,7 @@ public class ColumnFacade extends ColumnServiceImpl {
                         });
                     });
                     //数据解析
-                    analysisData(CacheKeyEnum.getName(key),entityMap,Long.valueOf(queryVo.getHospitalId()));
+                    analysisData(key,entityMap,Long.valueOf(queryVo.getHospitalId()));
                 });
             }
         }catch (Exception e){

src/main/java/com/diagbot/vo/data/HisDataDealVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+public class HisDataDealVO {
+
+    private Long hospitalId;
+
+    private Long modeId;
+
+    private Date startDate;
+
+    private Date endDate;
+
+}

src/main/java/com/diagbot/web/DataController.java

@@ -148,6 +148,13 @@ public class DataController {
         return aMedCrisisFacade.executeMedCrisis(list);
     }
 
+    @ApiOperation(value = "数据引擎-历史数据结构化处理")
+    @PostMapping("/hisDataDeal")
+    @SysLogger("hisDataDeal")
+    public RespDTO<List<AMedCrisisDTO>> hisDataDeal(@RequestBody HisDataDealVO hisDataDealVO){
+        return RespDTO.onSuc(aMedicalRecordFacade.hisDataDeal(hisDataDealVO));
+    }
+
     /*
     @ApiOperation(value = "数据引擎-列字段名和注释")
     @PostMapping("/getColumnZhAndCh")