1

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

@@ -159,7 +159,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendCrisis").permitAll()
                 .antMatchers("/qc/data/deleteFlag").permitAll()
                 .antMatchers("/qc/data/placeFile").permitAll()
+                .antMatchers("/qc/data/sendLisInfos").permitAll()
                 .antMatchers("/qc/data/sendLisResults").permitAll()
+                .antMatchers("/qc/data/sendPacsInfos").permitAll()
                 .antMatchers("/qc/data/sendPacsResults").permitAll()
                 .antMatchers("/qc/data/getColumnZhAndCh").permitAll()
                 .antMatchers("/qc/data/analyseRec").permitAll()

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

@@ -203,7 +203,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendCrisis", request)
                 || matchers("/qc/data/deleteFlag", request)
                 || matchers("/qc/data/placeFile", request)
+                || matchers("/qc/data/sendLisInfos", request)
                 || matchers("/qc/data/sendLisResults", request)
+                || matchers("/qc/data/sendPacsInfos", request)
                 || matchers("/qc/data/sendPacsResults", request)
                 || matchers("/qc/data/getColumnZhAndCh", request)
                 || matchers("/qc/data/analyseRec", request)

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

@@ -288,7 +288,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历无关联的质控条目!");
         }
 
-        // 获取病历所有数据
+        // 获取字典信息
         Map<String, Map<String, String>> dicMap = sysDictionaryFacade.getDictionaryWithKey(); // 获取字典信息
         // 获取文书信息
         RecordContentVO recordContentVO = new RecordContentVO();
@@ -301,7 +301,16 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 EncrypDES encrypDES = new EncrypDES();
                 for (RecordContentDTO recordContentDTO : recordContentDTOList) {
                     recTitle = recordContentDTO.getRecTitle();
-                    recordContentDTO.setXmlText(encrypDES.decryptor(recordContentDTO.getXmlText()));
+                    if(StringUtils.isNotEmpty(recordContentDTO.getXmlText())){
+                        recordContentDTO.setXmlText(encrypDES.decryptor(recordContentDTO.getXmlText()));
+                    }
+                    try {
+                        if(StringUtils.isNotEmpty(recordContentDTO.getHtmlText())){
+                            recordContentDTO.setHtmlText(encrypDES.decryptor(recordContentDTO.getHtmlText()));
+                        }
+                    } catch (Exception e) {
+                        recordContentDTO.setHtmlText(null);
+                    }
                 }
             } catch (Exception e) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -1000,6 +1009,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         if (ListUtil.isNotEmpty(list)) {
             MedrecVo medrecVo = new MedrecVo();
             Map<String, Object> content = new HashMap<>();
+            if(list!=null && list.size() > 1){}
             content.put("content", list);
             medrecVo.setTitle(key);
             medrecVo.setContent(content);

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

@@ -117,13 +117,13 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                 return RespDTO.onError("住院手术未输入病案首页编号!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("住院手术未输入医院编码!");
-            }else if(StringUtil.isEmpty(aDeleteFlagVO.getOperationOrderNo())){
+            }/*else if(StringUtil.isEmpty(aDeleteFlagVO.getOperationOrderNo())){
                 return RespDTO.onError("住院手术未输入顺序号!");
-            }else {
+            }*/else {
                 UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
                 updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        //.eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
                         .eq("is_deleted", IsDeleteEnum.N)
                         .set("is_deleted",IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.MedLisResult;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedLisResultServiceImpl;
+import com.diagbot.service.impl.MedPacsResultServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
@@ -15,6 +16,7 @@ import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedLisResultVO;
 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;
 
@@ -29,6 +31,10 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
     private boolean logSwitch;
     private TZDBConn tzDBConn = new TZDBConn();
 
+    @Autowired
+    @Qualifier("medLisResultServiceImpl")
+    private MedLisResultServiceImpl medLisResultService;
+
     /**
      * 同步前一天
      */
@@ -94,7 +100,7 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
             });
         }
         if(addE.size()>0){
-            this.saveBatch(addE);
+            medLisResultService.saveBatch(addE);
         }
         if(updateE.size()>0){
             this.baseMapper.updateBatchByKey(updateE);

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.MedPacsResult;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedPacsResultServiceImpl;
+import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
@@ -15,6 +16,7 @@ import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedPacsResultVO;
 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;
 
@@ -30,6 +32,11 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
 
     private TZDBConn tzDBConn = new TZDBConn();
 
+
+    @Autowired
+    @Qualifier("medPacsResultServiceImpl")
+    private MedPacsResultServiceImpl medPacsResultService;
+
     /**
      * 同步前一天
      */
@@ -72,6 +79,7 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
+            e.printStackTrace();
             aMedAbnormalInfoFacade.saveAbnormalInfo("检查结果-异常","",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
@@ -95,7 +103,7 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
             });
         }
         if(addE.size()>0){
-            this.saveBatch(addE);
+            medPacsResultService.saveBatch(addE);
         }
         if(updateE.size()>0){
             this.baseMapper.updateBatchByKey(updateE);

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;
@@ -46,6 +44,30 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
         execute(mrContentList);
     }
 
+    public void documentEncryption() {
+        for (int i = 1; i < 50; i++) {
+            QueryWrapper<MedicalRecordContent> queryWrapper = Wrappers.query();
+            queryWrapper.eq("creator", "0").eq("hospital_id", "13").last("LIMIT 5000");
+            List<MedicalRecordContent> medicalRecordContents = medicalRecordContentService.list(queryWrapper);
+            medicalRecordContents.forEach(s -> {
+                try {
+                    EncrypDES encrypDES = new EncrypDES();
+                    s.setHtmlText(encrypDES.encrytor(s.getHtmlText()));
+                    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();
+
+                }
+            });
+        }
+
+    }
+
     /**
      * 数据引擎-通过接口更新病历内容
      * @param list

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

@@ -33,5 +33,5 @@ public class AMedicalRecordContentVO {
     /**
      * xml文本信息
      */
-    private String xmlText;
+    private String xmlText = "1";
 }

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

@@ -89,8 +89,8 @@ public class DataController {
     @ApiOperation(value = "终末质控-文书详情")
     @PostMapping("/sendMrContent")
     @SysLogger("sendMrContent")
-    public RespDTO<List<AMedicalRecordContentDTO>> sendMrContent(@RequestBody List<AMedicalRecordContentVO> list){
-        return aMedicalRecordContentFacade.executeMrRecordContent(list);
+    public void sendMrContent(@RequestBody List<AMedicalRecordContentVO> list){
+        aMedicalRecordContentFacade.documentEncryption();
     }
 
     @ApiOperation(value = "数据引擎-获取医院病人住院记录信息")

src/main/resources/application-local.yml

@@ -59,10 +59,10 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://172.16.203.211:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      # url: jdbc:mysql://127.0.0.1:3306/qc-shaoyifu?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: langtong
+      # url: jdbc:mysql://172.16.203.211:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.121:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: teamtec
+      password: rpPh9Gn6BQ
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -112,7 +112,7 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 127.0.0.1  #Redis服务器地址
+    host: 192.168.2.121  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
@@ -165,7 +165,7 @@ oath.self.address: http://${myhost}:${server.port}
 
 # 加解密开关
 encrypt:
-  enable: false
+  enable: true
 
 swagger:
   enable: true

src/main/resources/mapper/MedicalRecordMapper.xml

@@ -46,7 +46,6 @@
         and t1.rec_id = t3.rec_id
         and t1.hospital_id = #{hospitalId}
         and t1.behospital_code = #{behospitalCode}
-        and t3.xml_text != ''
     </select>
 
     <update id="updateBatchByKey">