质控核查bug修改

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

@@ -252,6 +252,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                         .set("msg", algorithmVO.getOptResultAlgVO().getMsg())
                         .set("score", algorithmVO.getOptResultAlgVO().getScore())
                         .set("opt_type", 3)
+                        .set("grade_type",2)
                         .set("modifier", useId)
                         .set("gmt_modified", now)
                         .set("explain_info",algorithmVO.getOptResultAlgVO().getExplainInfo())
@@ -274,62 +275,29 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 //逻辑删除质控明细 0删除
                 if(analyzeVO.getDelStatus()==0)
                 {
-                    //在remark字段插入机器评分 ,手动评分用来恢复用
-                    //该条目是机器插入条目
                     qcresultDetailServiceImpl.update(new UpdateWrapper<QcresultDetail>()
                             .eq("id", algorithmVO.getOptResultAlgVO().getId())
                             .eq("is_deleted", IsDeleteEnum.N.getKey())
                             .eq("hospital_id", analyzeVO.getHospitalId())
                             .eq("behospital_code", analyzeVO.getBehospitalCode())
-                            .eq("grade_type",1)
                             .set("is_deleted", IsDeleteEnum.Y.getKey())
                             .set("grade_type",2)
                             .set("opt_type", 2)
                             .set("modifier", useId)
-                            .set("remark","机器评分")
-                            .set("gmt_modified", now)
-                    );
-                    //该条目是手动插入条目时
-                    qcresultDetailServiceImpl.update(new UpdateWrapper<QcresultDetail>()
-                            .eq("id", algorithmVO.getOptResultAlgVO().getId())
-                            .eq("is_deleted", IsDeleteEnum.N.getKey())
-                            .eq("hospital_id", analyzeVO.getHospitalId())
-                            .eq("behospital_code", analyzeVO.getBehospitalCode())
-                            .eq("grade_type",2)
-                            .set("is_deleted", IsDeleteEnum.Y.getKey())
-                            .set("opt_type", 2)
-                            .set("modifier", useId)
-                            .set("remark","手动评分")
                             .set("gmt_modified", now)
                     );
                 }
                 //1恢复
                 else if(analyzeVO.getDelStatus()==1)
                 {
-                    String creater = qcresultDetailServiceImpl.getOne(new QueryWrapper<QcresultDetail>()
-                            .eq("id", algorithmVO.getOptResultAlgVO().getId())).getCreator();
                     //该条目是机器插入条目
                     qcresultDetailServiceImpl.update(new UpdateWrapper<QcresultDetail>()
                             .eq("id", algorithmVO.getOptResultAlgVO().getId())
                             .eq("is_deleted", IsDeleteEnum.Y.getKey())
                             .eq("hospital_id", analyzeVO.getHospitalId())
                             .eq("behospital_code", analyzeVO.getBehospitalCode())
-                            .eq("remark","机器评分")
-                            .set("is_deleted", IsDeleteEnum.N.getKey())
-                            .set("grade_type",1)
-                            .set("opt_type", 1)
-                            .set("modifier", creater)
-                            .set("remark", null)
-                            .set("gmt_modified", now)
-                    );
-                    //该条目是手动插入条目时
-                    qcresultDetailServiceImpl.update(new UpdateWrapper<QcresultDetail>()
-                            .eq("id", algorithmVO.getOptResultAlgVO().getId())
-                            .eq("is_deleted", IsDeleteEnum.Y.getKey())
-                            .eq("hospital_id", analyzeVO.getHospitalId())
-                            .eq("behospital_code", analyzeVO.getBehospitalCode())
-                            .eq("remark","手动评分")
                             .set("is_deleted", IsDeleteEnum.N.getKey())
+                            .set("grade_type",2)
                             .set("opt_type", 1)
                             .set("modifier", useId)
                             .set("remark", null)

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

@@ -151,7 +151,8 @@ public class BehospitalInfoController {
 
     @ApiOperation(value = "逻辑删除质控条目[by:songxl]",
             notes = "behospitalCode：病历号，必填<br>" +
-                    "id：明细id，必填<br>")
+                    "id：明细id，必填<br>" +
+                    "delStatus：逻辑删除接口（1-还原和0-删除）标志 必填<br>")
     @PostMapping("/logicDelCase")
     @SysLogger("logicDelCase")
     @Transactional

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -65,7 +65,7 @@
         count(*) as jobNum
         from
         med_behospital_info a LEFT JOIN med_check_info b on a.behospital_code = b.behospital_code and a.hospital_id = b.hospital_id
-        where b.is_deleted = 'N' and b.job_distribution_name is not null
+        where b.is_deleted = 'N' and a.is_deleted = 'N' and b.job_distribution_name is not null and b.`status` = 0
         <if test="jobType != null ">
             and b.job_type = #{jobType}
         </if>
@@ -91,7 +91,7 @@
         count(*) as jobNum
         from
         med_behospital_info a LEFT JOIN med_check_info b on a.behospital_code = b.behospital_code and a.hospital_id = b.hospital_id
-        where b.is_deleted = 'N' and b.job_distribution_name is not null
+        where  b.is_deleted = 'N' and a.is_deleted = 'N' and b.job_distribution_name is not null and b.`status` = 0
         <if test="jobType != null ">
             and b.job_type = #{jobType}
         </if>