七院modeId映射

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -162,7 +162,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/deleteFlag").permitAll()
                 .antMatchers("/qc/data/sendPacsInfos").permitAll()
                 .antMatchers("/qc/data/sendLisInfos").permitAll()
-
                 .antMatchers("/qc/data/placeFile").permitAll()
                 .antMatchers("/qc/data/sendLisResults").permitAll()
                 .antMatchers("/qc/data/sendPacsResults").permitAll()
@@ -170,6 +169,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/analyseRec").permitAll()
                 .antMatchers("/qc/data/hisDataDeal").permitAll()
                 .antMatchers("/qc/data/sendDataDeal").permitAll()
+                .antMatchers("/qc/data/documentEncryption").permitAll()
                 .antMatchers("/qc/data_str/sendAdmissionNote").permitAll()
                 .antMatchers("/qc/data_str/sendBloodResult").permitAll()
                 .antMatchers("/qc/data_str/sendBloodTransfusion").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -213,6 +213,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/analyseRec", request)
                 || matchers("/qc/data/hisDataDeal", request)
                 || matchers("/qc/data/sendDataDeal", request)
+                || matchers("/qc/data/documentEncryption", request)
                 || matchers("/qc/data_str/sendAdmissionNote", request)
                 || matchers("/qc/data_str/sendBloodResult", request)
                 || matchers("/qc/data_str/sendBloodTransfusion", request)

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

@@ -131,11 +131,11 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     .eq("is_deleted",IsDeleteEnum.N), false);
             if (behospitalInfo != null) {
                 s.setGmtModified(new Date());
-//                s.setQcTypeId(initQcTypeId(s));
+                s.setQcTypeId(initQcTypeId(s));
                 updateE.add(s);
             } else {
                 s.setGmtCreate(new Date());
-//                s.setQcTypeId(initQcTypeId(s));
+                s.setQcTypeId(initQcTypeId(s));
                 this.save(s);
             }
         });

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

@@ -3,15 +3,13 @@ package com.diagbot.facade.data;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordContentDTO;
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedicalRecordContentVO;
 import com.google.common.collect.Lists;
@@ -121,4 +119,32 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             return RespDTO.onError(e.getMessage());
         }
     }
+
+    /**
+     * 文书加密
+     */
+
+    public  void documentEncryption(){
+        for (int i = 1; i < 1000; i++) {
+            QueryWrapper<MedicalRecordContent> queryWrapper= Wrappers.query();
+            queryWrapper.eq("creator","0").last("LIMIT 500, "+i+" ");
+            List<MedicalRecordContent>medicalRecordContents =medicalRecordContentService.list(queryWrapper);
+            medicalRecordContents.forEach(s->{
+                try {
+                    EncrypDES encrypDES =new EncrypDES();
+                    s.setXmlText(encrypDES.encrytor(s.getXmlText()));
+                    s.setCreator("1");
+                    QueryWrapper<MedicalRecordContent> updateQueryWrapper = new QueryWrapper<>();
+                    updateQueryWrapper.eq("rec_id", s.getRecId());
+                    updateQueryWrapper.eq("hospital_id", s.getHospitalId());
+                    updateQueryWrapper.eq("creator",String.valueOf(0));
+                    medicalRecordContentService.update(s,updateQueryWrapper);
+                } catch (Exception e) {
+                    e.printStackTrace();
+
+                }
+            });
+        }
+
+    }
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.facade.data;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RecordContentDTO;
 import com.diagbot.dto.RespDTO;
@@ -382,18 +383,17 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                         qcAbnormal.setDescription(s.getRecTitle());
                         qcAbnormal.setGmtCreate(new Date());
                         qcAbnormalList.add(qcAbnormal);
+                    } else if (modeId == Long.valueOf("1")) {
+                        BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
+                                .eq("behospital_code", s.getBehospitalCode())
+                                .eq("hospital_id", s.getHospitalId()), false);
+                        if (behospitalInfo != null) {
+                            //如果病人住院信息存在，更新对应的qc_type_id
+                            Long qcTypeId = initQcTypeId(behospitalInfo);
+                            behospitalInfo.setQcTypeId(qcTypeId);
+                            behospitalInfoList.add(behospitalInfo);
+                        }
                     }
-//                    else if (modeId == Long.valueOf("1")) {
-//                        BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
-//                                .eq("behospital_code", s.getBehospitalCode())
-//                                .eq("hospital_id", s.getHospitalId()), false);
-//                        if (behospitalInfo != null) {
-//                            //如果病人住院信息存在，更新对应的qc_type_id
-//                            Long qcTypeId = initQcTypeId(behospitalInfo);
-//                            behospitalInfo.setQcTypeId(qcTypeId);
-//                            behospitalInfoList.add(behospitalInfo);
-//                        }
-//                    }
                     s.setModeId(modeId);
                     //新增或修改
                     MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
@@ -477,11 +477,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         } else {
             modeId = Long.valueOf("0");
         }
-        if (modeId==Long.valueOf("1")){
+        if (modeId==1){
             if (medicalRecord.getRecTitle().contains("24小时")){
                 modeId=Long.valueOf("0");
             }
-        }else if (modeId==Long.valueOf("5")){
+        }else if (modeId==5){
             if (medicalRecord.getRecTitle().contains("死亡")){
                 modeId=Long.valueOf("24");
             }else  if(medicalRecord.getRecTitle().contains("同意书")){
@@ -491,7 +491,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             }else  if(medicalRecord.getRecTitle().contains("信息单")){
                 modeId=Long.valueOf("0");
             }
-        }else {
+        }else if (modeId==0){
             if (medicalRecord.getRecTitle().contains("同意书")){
                 modeId=Long.valueOf("53");
             }else if (medicalRecord.getRecTitle().contains("告知书")){
@@ -564,4 +564,5 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
     }
 
+
 }

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

@@ -37,19 +37,16 @@ public class SendDataDealFacade {
 
     public void sendDataDeal(String startDate,String stopDate){
         //根据时间得到历史病人登记数据
-        sendDataDealABehospitalInfo(startDate,stopDate);
-        //根据的到的病人登记数据来获取病人的其他信息
-//        if (behospitalInfoList.size()>0){
-//            behospitalInfoList.forEach(s->{
-//                sendDataDealADoctorAdvice(s.getBehospitalCode());
-//                sendDataDealAMedicalRecord(s.getBehospitalCode());
-////                sendDataDealAHomePage(s.getBehospitalCode());
-////                sendDataDealAHomeDiagnoseInfo(s.getBehospitalCode());
-////                sendDataDealAHomeOperationInfo(s.getBehospitalCode());
-//            });
-//        }else {
-//            System.out.println("没有该时间点的病人登记信息");
-//        }
+       List<BehospitalInfo> behospitalInfoList=  sendDataDealABehospitalInfo(startDate,stopDate);
+//        根据的到的病人登记数据来获取病人的其他信息
+        if (behospitalInfoList.size()>0){
+            behospitalInfoList.forEach(s->{
+                sendDataDealADoctorAdvice(s.getBehospitalCode());
+                sendDataDealAMedicalRecord(s.getBehospitalCode());
+            });
+        }else {
+            System.out.println("没有该时间点的病人登记信息");
+        }
 
     }
 

src/main/java/com/diagbot/task/TASK_CX.java

@@ -57,6 +57,7 @@ public class TASK_CX implements SchedulingConfigurer {
                     taskVO.setType(1); // 类型过滤(1：出院时间比当前时间早3天前的病历（例如：长兴病历）)
                     taskVO.setIndividuation(Arrays.asList(1)); //个性化需求【1：近3天不含当天的病历强制评分更新】
                     behospitalInfoFacade.execute(taskVO, param);
+
                 }
             }
         }, new Trigger() {

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

@@ -225,6 +225,12 @@ public class DataController {
         sendDataDealFacade.sendDataDeal(startDate,stopDate);
     }
 
+    @ApiOperation(value = "文书加密")
+    @PostMapping("/documentEncryption")
+    @SysLogger("documentEncryption")
+    public void sendDataDeal(){
+        aMedicalRecordContentFacade.documentEncryption();
+    }
 
     /*
     @ApiOperation(value = "数据引擎-列字段名和注释")

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 5858
+  port: 5852
   max-http-header-size: 10MB
 
 hystrix:

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: local
+    active: dev
   main:
     allow-bean-definition-overriding: true