save

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

@@ -117,6 +117,7 @@ public class StructuralOldDataFacade {
                     + "','yyyymmdd') and t.behospitalDate <= to_date('" + structuralDataVo.getStopDate() + "','yyyymmdd')";
 
 //            String sql ="select t.behospitalCode ,t.patientId  from med_behospital_info t where t.leaveHospitalDate is null";
+
             List<StructuralDataVo> strings = fjtzdbConnHarp.getBehospitalInfoDate(sql);
 
             strings.forEach(s -> {

src/main/java/com/diagbot/mapper/BehospitalInfoMapper.java

@@ -7,6 +7,7 @@ import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -82,6 +83,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @return
      */
     public int operationCount(FilterVO filterVO);
+    public ArrayList<String> operationBehospitalCode(OperationBehospitalCodeVO operationBehospitalCodeVO);
 
     /**
      * 一级手术级别人数-全院-首页

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

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -58,9 +59,7 @@ public class DataConsistencyTask implements SchedulingConfigurer{
                     LocalDate localDate1 = localDate.minusDays(2);
                     String endDate = localDate1.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                     String startDate = "2022-10-01";
-
-
-                    //dataConsistencyService.consoleConsistency();
+                    dataConsistencyService.consoleConsistency(startDate, endDate);
                 }
             }
         }, new Trigger() {

src/main/java/com/diagbot/util/FJTZDBConnHarp.java

@@ -232,6 +232,24 @@ public class FJTZDBConnHarp {
 		}
 		return strings;
 	}
+	public List<String> getBehospitalInfoCodeDate(String sql) {
+		List<String> strings=Lists.newLinkedList();
+		try {
+			log.info(sql);
+			FJTZDBConnHarp dbconn=new FJTZDBConnHarp();
+			ResultSet rs =dbconn.Query(sql, null);
+
+			while(rs.next()){
+				strings.add(rs.getString("behospitalCode"));
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return strings;
+	}
+
 
 	/**
 	 * 获取病人登录信息

src/main/java/com/diagbot/vo/OperationBehospitalCodeVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+
+/**
+ * @author jianghaodi
+ * @create 2022/10/11 19:30
+ */
+@Data
+public class OperationBehospitalCodeVO {
+    private String startDate;
+    private String endDate;
+    private String hospitalId;
+}

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

@@ -4,6 +4,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.*;
 import com.diagbot.facade.data.*;
 import com.diagbot.facade.str.AStrOperativeNoteFacade;
+import com.diagbot.service.impl.DataConsistencyServiceImpl;
 import com.diagbot.vo.data.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,6 +54,8 @@ public class DataController {
     private StructuralOldDataFacade sendOnebehospitalCode;
     @Autowired
     private AStrOperativeNoteFacade aStrOperativeNoteFacade;
+    @Autowired
+    private DataConsistencyServiceImpl dataConsistencyService;
 
 
     //
@@ -262,4 +265,13 @@ public class DataController {
     public void dataViewSupplementaryRecord(@RequestBody BeHospitalInfoDataVo beHospitalInfoDataVo) {
         sendOnebehospitalCode.sendBehospitalCodeDataOld(beHospitalInfoDataVo);
     }
+
+    @PostMapping("/consoleDataConsistency")
+    @ApiOperation(value = "数据补录")
+    @SysLogger("consoleDataConsistency")
+    public void consoleDataConsistency(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) {
+        dataConsistencyService.consoleConsistency(startDate, endDate);
+    }
+
+
 }

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
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -842,6 +842,8 @@
         </if>
     </select>
 
+
+
     <!-- 入院人数统计-首页 -->
     <select id="beHosCount" parameterType="com.diagbot.vo.FilterVO"
             resultType="com.diagbot.dto.NumDTO">
@@ -10749,4 +10751,31 @@
             </if>
         </if>
     </select>
+
+    <select id="operationBehospitalCode"  resultType="String">
+        SELECT
+        DISTINCT a.behospital_code
+        FROM
+        med_behospital_info a,
+        med_medical_record c,
+        qc_mode d
+        WHERE
+        a.is_deleted = 'N'
+        AND c.is_deleted = 'N'
+        AND d.is_deleted = 'N'
+        AND a.hospital_id = c.hospital_id
+        AND a.behospital_code = c.behospital_code
+        AND c.mode_id = d.id
+        AND d.`name` in ('手术记录','有创操作')
+        <![CDATA[AND a.qc_type_id <>0 ]]>
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+        <if test="startDate != null and startDate != ''">
+            <![CDATA[ AND a.leave_hospital_date >= #{startDate}]]>
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
+        </if>
+    </select>
 </mapper>