Browse Source

后台接口修改

chengyao 4 years ago
parent
commit
868b9ef11a

+ 1 - 1
doc/031.20210326v2.0.2/qc_initv2.0.2.sql

@@ -299,7 +299,7 @@ ward_round_result` double(5,0) DEFAULT NULL COMMENT '医师查房记录完整率
   `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
   `creator` varchar(60) DEFAULT '0' COMMENT '创建人,0表示无创建人值',
   `modifier` varchar(60) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
-  PRIMARY KEY (`id`,`start_date`),
+  PRIMARY KEY (`id`),
   UNIQUE KEY `index_time` (`start_date`,`end_date`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1207 DEFAULT CHARSET=utf8;
 

+ 6 - 1
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -571,8 +571,14 @@ public class ConsoleFacade {
      * @param filterVO
      * @return 2170
      */
+    @Transactional
     public Boolean saveMedicaIndicator(FilterVO filterVO){
         List<String> timeList = filterFacade.getTimeList(filterVO);
+        QueryWrapper<MedIndexResult> qw = new QueryWrapper<>();
+        qw.eq("hospital_id",filterVO.getHospitalId());
+        qw.ge("start_date",filterVO.getStartDate()+" 00:00:00");
+        qw.le("end_date", handleTime(filterVO.getEndDate()));
+        medIndexResultFacade.remove(qw);
         for (String startTime : timeList) {
             filterVO.setStartDate(startTime);
             filterVO.setEndDate( handleTime(startTime));
@@ -588,7 +594,6 @@ public class ConsoleFacade {
      * @param filterVO
      * @return 2170
      */
-    @Transactional
     public void getMedicaIndicator(FilterVO filterVO){
         MedIndexResult medIndexResult = new MedIndexResult();
         Map<String, Long> selectOperationNumMap = behospitalInfoFacade.selectOperationNum(filterVO);

+ 2 - 2
src/main/java/com/diagbot/web/ConsoleController.java

@@ -183,8 +183,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "病案指标数据存储[by:cy]",
-            notes = "startDate: 起始时间-样例[2021-01-01] <br>" +
-                    "endDate: 结束时间-样例[2021-01-01]<br>")
+            notes = "startDate: 起始时间-样例[2021-01-01]请严格按照日历时间传参!!! <br>" +
+                    "endDate: 结束时间-样例[2021-01-01]请严格按照日历时间传参!!!<br>")
     @PostMapping("/saveMedicaIndicator")
     @SysLogger("saveMedicaIndicator")
     public RespDTO<Boolean> saveMedicaIndicator(@RequestBody @Valid FilterVO filterVO) {

+ 1 - 3
src/main/resources/mapper/MedIndexResultMapper.xml

@@ -19,9 +19,7 @@
         <result column="operation_complete_result" property="operationCompleteResult" />
         <result column="implants_result" property="implantsResult" />
         <result column="blood_result" property="bloodResult" />
-        <result column="
-ward_round_result" property="
-wardRoundResult" />
+        <result column="ward_round_result" property="wardRoundResult" />
         <result column="rescue_result" property="rescueResult" />
         <result column="sec_file_result" property="secFileResult" />
         <result column="file_complete_result" property="fileCompleteResult" />