1、调整入院登记数据，

新病历归档状态和时间为空，质控类型为0，查询时不再局限于标记删除的数据，修改时调整删除标识为未删除状态（预防his删除后恢复再次进行编辑保存操作）；
2、住院医嘱，修改时调整删除标识为未删除状态（预防his删除后恢复再次进行编辑保存操作）

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
+import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.QcType;
@@ -42,26 +43,6 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
     private TZDBConn tzDBConn = new TZDBConn();
 
-    /**
-     * 终末质控-同步前一天的入院记录
-     */
-    public void executeBehospital() {
-        //String sql="select * from br_inpatientinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from br_inpatientinfo where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<BehospitalInfo> behospitalInfoList = tzDBConn.getBehospitalInfo(sql);
-        execute(behospitalInfoList);
-    }
-
-    /**
-     * 同步前一天的入院记录
-     */
-    public void executeBehospitalPast() {
-        String sql="select * from br_inpatientinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<BehospitalInfo> behospitalInfoList = tzDBConn.getBehospitalInfo(sql);
-        execute(behospitalInfoList);
-    }
-
-
     /**
      * 通过接口更新病人住院记录信息
      * @param list
@@ -100,10 +81,10 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                         behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(s.getPlacefileDate()));
                     }
                     behospitalInfoList.add(behospitalInfo);
-
                 });
 
                 execute(behospitalInfoList);
+
                 if(logSwitch){
                     behospitalInfoList.forEach(s->{
                         aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-正常","", JSON.toJSONString(list),"","");
@@ -121,29 +102,29 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     }
 
     public void execute(List<BehospitalInfo> behospitalInfoList){
-        List<BehospitalInfo> addE = Lists.newLinkedList();
-        List<BehospitalInfo> updateE = Lists.newLinkedList();
+        List<BehospitalInfo> addE=Lists.newArrayList();
+        List<BehospitalInfo> updateE=Lists.newArrayList();
         behospitalInfoList.stream().forEach(s -> {
             BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
                     .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N), false);
+                    .eq("hospital_id", s.getHospitalId()));
             if (behospitalInfo != null) {
-                s.setGmtModified(new Date());
-                s.setQcTypeId(initQcTypeId(s));
+                s.setIsDeleted(IsDeleteEnum.N.getKey());
+                s.setGmtModified(DateUtil.now());
                 updateE.add(s);
             } else {
                 s.setGmtCreate(new Date());
-                s.setQcTypeId(initQcTypeId(s));
+                s.setIsPlacefile("0");//默认为未归档状态
+                s.setPlacefileDate(null);//默认归档时间为空
                 addE.add(s);
             }
         });
-        if(addE.size()>0){
-            behospitalInfoService.saveBatch(addE);
-        }
         if(updateE.size()>0){
             behospitalInfoService.updateBatchByKey(updateE);
         }
+        if(addE.size()>0){
+            behospitalInfoService.saveBatch(addE);
+        }
     }
 
     /**

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.DoctorAdvice;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
@@ -35,21 +36,6 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
 
     private TZDBConn tzDBConn = new TZDBConn();
 
-    /**
-     * 终末质控-同步前一天的入院病人医嘱信息
-     */
-    public void executeDoctorAdvice() {
-        //String sql="select * from br_doctadvice where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from br_doctadvice where BRZYID in (select BRZYID from br_inpatientinfo where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) and requestflag='1')";
-        List<DoctorAdvice> doctorAdviceList = tzDBConn.getDoctorAdvice(sql);
-        execute(doctorAdviceList);
-    }
-
-    public void executeDoctorAdvicePast() {
-        String sql="select * from br_doctadvice where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<DoctorAdvice> doctorAdviceList = tzDBConn.getDoctorAdvice(sql);
-        execute(doctorAdviceList);
-    }
     /**
      * 数据引擎-通过接口更新医生医嘱信息
      * @param list
@@ -106,9 +92,10 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
                         .eq("doctor_advice_id", s.getDoctorAdviceId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code",s.getBehospitalCode()), false);
+                        .eq("behospital_code",s.getBehospitalCode()));
                 if (doctorAdvice != null) {
-                    s.setGmtModified(new Date());
+                    s.setIsDeleted(IsDeleteEnum.N.getKey());
+                    s.setGmtModified(DateUtil.now());
                     updateE.add(s);
                 } else {
                     s.setGmtCreate(new Date());

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

@@ -46,7 +46,7 @@ public class BehospitalInfoTask implements SchedulingConfigurer{
                         && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    aBehospitalInfoFacade.executeBehospital();
+                    //aBehospitalInfoFacade.executeBehospital();
                 }
             }
         }, new Trigger() {

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

@@ -47,7 +47,7 @@ public class DoctorAdviceTask implements SchedulingConfigurer{
                         && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    aDoctorAdviceFacade.executeDoctorAdvice();
+                    //aDoctorAdviceFacade.executeDoctorAdvice();
                 }
             }
         }, new Trigger() {

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -5700,6 +5700,9 @@
                 <if test="item.modifier != null">
                     modifier = #{item.modifier},
                 </if>
+                <if test="item.isDeleted != null">
+                    is_deleted = #{item.isDeleted},
+                </if>
             </set>
             where behospital_code = #{item.behospitalCode} and hospital_id = #{item.hospitalId}
         </foreach>

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -207,6 +207,9 @@
                 <if test="item.modifier != null">
                     modifier = #{item.modifier},
                 </if>
+                <if test="item.isDeleted != null">
+                    is_deleted = #{item.isDeleted},
+                </if>
             </set>
             where doctor_advice_id = #{item.doctorAdviceId} and hospital_id = #{item.hospitalId} and behospital_code =
             #{item.behospitalCode}