版本更新，调整

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

@@ -115,6 +115,19 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/dataimport/test", request)
                 || matchers("/sys/user/pageset/getPageSet", request)
                 || matchers("/sys/user/pageset/savePageSet", request)
+                || matchers("/qc/data/sendDoctorInfos", request)
+                || matchers("/qc/data/sendDeptInfos", request)
+                || matchers("/qc/data/sendRecordTypes", request)
+                || matchers("/qc/data/sendMrRecordIng", request)
+                || matchers("/qc/data/sendMrContent", request)
+                || matchers("/qc/data/sendMrRecord", request)
+                || matchers("/qc/data/sendPatientInfo", request)
+                || matchers("/qc/data/sendDoctorAdvice", request)
+                || matchers("/qc/data/sendHomePageIng", request)
+                || matchers("/qc/data/sendHomePage", request)
+                || matchers("/qc/data/sendHomeDiagnose", request)
+                || matchers("/qc/data/sendHomeOperation", request)
+                || matchers("/qc/data/sendCrisis", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/dto/data/ABehospitalInfoDTO.java

@@ -100,12 +100,42 @@ public class ABehospitalInfoDTO{
     private String diagnose;
 
     /**
-     * 医生ID
+     * 住院医生ID
+     */
+    private String behDoctorId;
+
+    /**
+     * 住院医生姓名
+     */
+    private String behDoctorName;
+
+    /**
+     * 主治医生ID
      */
     private String doctorId;
 
     /**
-     * 医生姓名
+     * 主治医生姓名
      */
     private String doctorName;
+
+    /**
+     * 主任医生ID
+     */
+    private String directorDoctorId;
+
+    /**
+     * 主任医生姓名
+     */
+    private String directorDoctorName;
+
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    private String placefileDate;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
 import com.diagbot.entity.*;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
@@ -79,6 +80,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 if(StringUtil.isNotBlank(s.getBehospitalDate())){
                     behospitalInfo.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
                 }
+                if(StringUtil.isNotBlank(s.getPlacefileDate())){
+                    behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(s.getPlacefileDate()));
+                }
                 behospitalInfoList.add(behospitalInfo);
 
             });
@@ -108,8 +112,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<BehospitalInfo> updateE = Lists.newLinkedList();
         behospitalInfoList.stream().forEach(s -> {
             BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
-            .eq("behospital_code", s.getBehospitalCode())
-            .eq("hospital_id", s.getHospitalId()));
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N));
             if (behospitalInfo != null) {
                 s.setGmtModified(new Date());
                 s.setQcTypeId(initQcTypeId(s));
@@ -139,11 +144,13 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
                 .eq("behospital_code", s.getBehospitalCode())
                 .eq("hospital_id", s.getHospitalId())
-                .eq("mode_id", Long.valueOf("1")));
+                .eq("mode_id", Long.valueOf("1"))
+                .eq("is_deleted",IsDeleteEnum.N));
         if(medicalRecord!=null){
             QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                     .eq("name",medicalRecord.getRecTitle())
-                    .eq("hospital_id", s.getHospitalId()));
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N));
             if(qcType!=null){
                 qcTypeId=qcType.getId();
             }else{

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

@@ -160,7 +160,12 @@ public class AHomePageFacade extends HomePageServiceImpl{
         String behospitalCode =aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
         Long hospitalId=aHomePageIngVO.getHomePages().get(0).getHospitalId();
         Long modeId=Long.valueOf("6");//病案首页默认为6
-        if(aHomePageIngVO.getDockModeType().equals("1")){
+        if(aHomePageIngVO.getDockModeType().equals("0")){
+            Map<String,Object> map=new HashMap<String,Object>();
+            List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
+            map.put("homePages",homePageDtoList);
+            return RespDTO.onSuc(map);
+        }else if(aHomePageIngVO.getDockModeType().equals("1")){
             //页面模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
             Map<String,Object> map=new HashMap<String,Object>();

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordTypeDTO;
 import com.diagbot.entity.MedRecordType;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedRecordTypeServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
@@ -69,7 +70,8 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
             medRecordTypeList.stream().forEach(s -> {
                 MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
                         .eq("type_id", s.getTypeId())
-                        .eq("hospital_id", s.getHospitalId()));
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N));
                 if (mrType != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

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

@@ -6,6 +6,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.dto.data.AMrContentDTO;
 import com.diagbot.entity.*;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
 import com.diagbot.facade.QcTypeFacade;
@@ -152,7 +153,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         MedicalRecord medicalRecord=new MedicalRecord();
         BeanUtil.copyProperties(aMrContentVO.getRecords().get(0),medicalRecord);
         Long modeId=initModeId(medicalRecord);
-        if(aMrContentVO.getDockModeType().equals("1")){
+        if(aMrContentVO.getDockModeType().equals("0")){
+            Map<String,Object> map=new HashMap<String,Object>();
+            List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(aMrContentVO.getRecords(), AMedicalRecordDTO.class);
+            map.put("records",medicalRecordDTOList);
+            return RespDTO.onSuc(map);
+        }else if(aMrContentVO.getDockModeType().equals("1")){
             if(modeId==0 || modeId==null){
                 return RespDTO.onError("无对应的文书类型");
             }
@@ -222,7 +228,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                         Long qcTypeId=Long.valueOf("0");
                         QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                                 .eq("name",s.getRecTitle())
-                                .eq("hospital_id", s.getHospitalId()));
+                                .eq("hospital_id", s.getHospitalId())
+                                .eq("is_deleted",IsDeleteEnum.N));
                         if(qcType!=null){
                             behospitalInfo.setQcTypeId(qcType.getId());
                         }else{

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

@@ -2,8 +2,6 @@ package com.diagbot.vo.data;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class ABehospitalInfoVO {
     /**
@@ -131,4 +129,14 @@ public class ABehospitalInfoVO {
      */
     private String directorDoctorName;
 
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    private String placefileDate;
+
 }

src/main/resources/application-local.yml

@@ -111,8 +111,8 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    host: 192.168.2.132  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
@@ -161,7 +161,7 @@ io.github.lvyahui8.spring:
 
 myhost: localhost
 oath.self.address: http://${myhost}:${server.port}
-qc.address: http://192.168.2.232:6009
+qc.address: http://192.168.2.132:6009
 
 # 加解密开关
 encrypt:

src/main/resources/jdbc.properties

@@ -18,7 +18,7 @@ jdbc.password=zjlt@2020
 remote.address.ver=http://192.18.101.207:2030/index.html
 remote.address.hor=http://192.18.101.207:2030/indexHorizontal.html
 
-process.qc.url=http://192.168.100.157:1489/index.html
+process.qc.url=http://192.168.2.132:1489/index.html
 
 #his\u65b9\u60a3\u8005\u63a5\u53e3\u5730\u5740
 his.patient.url=

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2567,6 +2567,15 @@
                 <if test="item.directorDoctorName != null">
                     director_doctor_name = #{item.directorDoctorName},
                 </if>
+                <if test="item.placefileDate != null">
+                    placefile_date = #{item.placefileDate},
+                </if>
+                <if test="item.directorDoctorName != null">
+                    director_doctor_name = #{item.directorDoctorName},
+                </if>
+                <if test="item.isPlacefile != null">
+                    is_placefile = #{item.isPlacefile},
+                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>