Merge branch 'master' into test

src/main/java/com/diagbot/dto/MsgDTO.java

@@ -19,6 +19,8 @@ public class MsgDTO {
     private BigDecimal score;
     //提示信息
     private String msg;
+    //标准提示信息
+    private String standardMsg;
     //单项否决
     private String isReject;
     //模块名称

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

@@ -46,7 +46,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> mrStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        retMap.put("本月病历数", 0);
+        /*retMap.put("本月病历数", 0);
         retMap.put("本月质控数-人工", 0);
         retMap.put("本月质控数-机器", 0);
         retMap.put("本月甲级病历-人工", 0);
@@ -54,7 +54,7 @@ public class ConsoleFacade {
         retMap.put("本月乙级病历-人工", 0);
         retMap.put("本月乙级病历-机器", 0);
         retMap.put("本月不合格病历-人工", 0);
-        retMap.put("本月不合格病历-机器", 0);
+        retMap.put("本月不合格病历-机器", 0);*/
 
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String startDate = getStartDateStr(filterVO.getType());
@@ -66,52 +66,87 @@ public class ConsoleFacade {
                 .eq("hospital_id", hospitalId)
                 .ge("leave_hospital_date", startDate);
         int behospitalInfoCount = behospitalInfoFacade.count(behospitalInfoQueryWrapper);
-        //本月病历数
-        retMap.put("本月病历数", behospitalInfoCount);
-
+        //病历数
+        if (filterVO.getType().equals(1)) {
+            retMap.put("本月病历数", behospitalInfoCount);
+        } else if (filterVO.getType().equals(2)) {
+            retMap.put("本年病历数", behospitalInfoCount);
+        }
 
         QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
-        BeanUtil.copyProperties(qcresultFilterVO, filterVO);
+        BeanUtil.copyProperties(filterVO, qcresultFilterVO);
         //本月质控数-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("");
         int qcresultByGradeType2Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月质控数-人工", qcresultByGradeType2Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月质控数-人工", qcresultByGradeType2Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年质控数-人工", qcresultByGradeType2Count);
+        }
         //本月质控数-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("");
         int qcresultByGradeType1Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月质控数-机器", qcresultByGradeType1Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月质控数-机器", qcresultByGradeType1Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年质控数-机器", qcresultByGradeType1Count);
+        }
         //本月甲级病历-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("甲");
         int qcresultByGradeType2AndLevel1Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月甲级病历-人工", qcresultByGradeType2AndLevel1Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月甲级病历-人工", qcresultByGradeType2AndLevel1Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年甲级病历-人工", qcresultByGradeType2AndLevel1Count);
+        }
         //本月甲级病历-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("甲");
         int qcresultByGradeType1AndLevel1Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月甲级病历-机器", qcresultByGradeType1AndLevel1Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月甲级病历-机器", qcresultByGradeType1AndLevel1Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年甲级病历-机器", qcresultByGradeType1AndLevel1Count);
+        }
         //本月乙级病历-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("乙");
         int qcresultByGradeType2AndLevel2Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月乙级病历-人工", qcresultByGradeType2AndLevel2Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月乙级病历-人工", qcresultByGradeType2AndLevel2Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年乙级病历-人工", qcresultByGradeType2AndLevel2Count);
+        }
         //本月乙级病历-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("乙");
         int qcresultByGradeType1AndLevel2Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月乙级病历-机器", qcresultByGradeType1AndLevel2Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月乙级病历-机器", qcresultByGradeType1AndLevel2Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年乙级病历-机器", qcresultByGradeType1AndLevel2Count);
+        }
         //本月乙级病历-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("丙");
         int qcresultByGradeType2AndLevel3Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+        }
         //本月乙级病历-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("丙");
         int qcresultByGradeType1AndLevel3Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+        if (filterVO.getType().equals(1)) {
+            retMap.put("本月不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+        } else if (filterVO.getType().equals(2)) {
+            retMap.put("本年不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+        }
         return retMap;
     }
 

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

@@ -10,12 +10,9 @@ import com.diagbot.entity.QcCasesEntryHospital;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.QcCasesEntryHospitalService;
 import com.diagbot.service.impl.QcCasesEntryHospitalServiceImpl;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.util.UserUtils;
 import com.diagbot.vo.QcCasesEntryFindVO;
 import com.diagbot.vo.QcCasesEntryHospitalVO;
 import com.diagbot.vo.QcCasesEntryUpdataVO;

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

@@ -14,6 +14,7 @@ import com.diagbot.vo.QcCasesEntryUpdataVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,6 +53,7 @@ public class QcCasesEntryHospitalController {
                     "isReject：单项否决 1-单项否决 0-非</br>isUsed：是否启用 0-未启用 1-启用")
     @PostMapping("/updataQcCasesEntry")
     @SysLogger("updataQcCasesEntry")
+    @Transactional
     public RespDTO<Boolean> updataQcCasesEntry(@RequestBody @Valid QcCasesEntryUpdataVO qcCasesEntryUpdataVO) {
         return RespDTO.onSuc(qcCasesEntryHospitalFacade.updataQcCasesEntrys(qcCasesEntryUpdataVO));
     }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -65,7 +65,8 @@
     </select>
 
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
-        SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id, a.cases_id cases_id, d.score cases_score,b.id model_id
+        SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,
+        a.cases_id cases_id, d.score cases_score,b.id model_id, a.name standard_msg
         FROM `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d
         where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N' and d.is_deleted = 'N'
         and a.id = c.cases_entry_id