优化和修复问题

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/emr/EmrAuditController.java

@@ -44,4 +44,10 @@ public class EmrAuditController {
         return server.getHistoricalAudit(emrId);
     }
 
+    @GetMapping("/updateFinalControl")
+    public ResultVo<String> updateFinalControl(@RequestParam("patNo") String patNo,
+                                               @RequestParam("times") Integer times) {
+        return server.updateFinalControl(patNo, times);
+    }
+
 }

src/main/java/thyyxxk/webserver/dao/his/inpatient/XiangMuLuRuDao.java

@@ -462,7 +462,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "  cast(#{item.chargeFee,jdbcType=DECIMAL} / #{item.chargeAmount,jdbcType=DECIMAL} as decimal(14,5)) , " +
             // 数量
             "cast(#{item.chargeAmount,jdbcType=DECIMAL} as decimal(14,5)) " +
-            ", #{zyDetailCharge.zySerialNo} , #{item.serial} , 73 ,'1' )" +
+            ", #{zyDetailCharge.zySerialNo} , #{item.serial} , '73' ,'1' )" +
             "</foreach>" +
             "</script>")
     void shenQingYaoPing(@Param("zyDetailCharge") ZyDetailCharge zyDetailCharge,

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/emr/EmrAuditDao.java

@@ -88,4 +88,14 @@ public interface EmrAuditDao {
             "  and history = 1")
     List<EmrAuditDetail> getHistoricalAudit(Integer emrId);
 
+    @Update("update zy_actpatient " +
+            "set final_control = 1 " +
+            "where inpatient_no = #{patNo} " +
+            "  and admiss_times = #{times}; " +
+            "update zy_inactpatient " +
+            "set final_control = 1 " +
+            "where inpatient_no = #{patNo} " +
+            "  and admiss_times = #{times};")
+    void updateFinalControl(String patNo, Integer times);
+
 }

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/emr/EmrControlDaoV2.java

@@ -71,7 +71,9 @@ public interface EmrControlDaoV2 {
     List<QualityControlAnalysisOfMedicalRecords> queryEmrRulePatient(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper,
                                                                      @Param("tableName") String tableName);
 
-    @Select("select a.name, remark, number_of_defects, b.emr_name,scoring_criteria " +
+    @Select("select a.name, remark, number_of_defects, b.emr_name,scoring_criteria, " +
+            "       a.pat_no,\n" +
+            "       a.times " +
             "from emr_audit_detail a " +
             "         left join emr_patient_data b on (a.emr_id = b.id) " +
             "where doctor = #{userCode} " +

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/emr/EmrAuditDetail.java

@@ -11,6 +11,9 @@ import java.util.Date;
 @Accessors(chain = true)
 public class EmrAuditDetail implements Serializable {
 
+    private String patNo;
+    private Integer times;
+
     private static final long serialVersionUID = 3711491177934905816L;
 
     /**

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/orderquash/ReqOrderQuash.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.entity.zhuyuanyisheng.orderquash;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -31,6 +32,9 @@ public class ReqOrderQuash implements Serializable {
      */
     private String reqId;
 
+    @TableField(exist = false)
+    private String reqName;
+
     /**
      * 申请备注
      */
@@ -40,6 +44,8 @@ public class ReqOrderQuash implements Serializable {
      * 审核人
      */
     private String approverId;
+
+    @TableField(exist = false)
     private String approverName;
 
     /**

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/OrderQuashService.java

@@ -121,19 +121,20 @@ public class OrderQuashService {
         }
 
         if (publicServer.needRule(38)) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "您没有审核权限。");
-        }
+            String code = TokenUtil.getTokenUserId();
+            Date now = new Date();
 
-        String code = TokenUtil.getTokenUserId();
-        Date now = new Date();
+            for (ReqOrderQuash item : list) {
+                item.setApproverId(code);
+                item.setApproverDatatime(now);
+                revocationOfMedicalOrders(item);
+            }
 
-        for (ReqOrderQuash item : list) {
-            item.setApproverId(code);
-            item.setApproverDatatime(now);
-            revocationOfMedicalOrders(item);
+            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
         }
 
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
+        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "您没有审核权限。");
+
     }
 
     /**

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrAuditServer.java

@@ -1,6 +1,5 @@
 package thyyxxk.webserver.service.zhuyuanyisheng.emr;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import lombok.extern.slf4j.Slf4j;
@@ -97,4 +96,10 @@ public class EmrAuditServer {
         return ResultVoUtil.success(map);
     }
 
+
+    public ResultVo<String> updateFinalControl(String patNo, Integer times) {
+        dao.updateFinalControl(patNo, times);
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
+    }
+
 }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrControlRuleSeverV2.java

@@ -80,7 +80,7 @@ public class EmrControlRuleSeverV2 {
         JSONObject js = new JSONObject();
         List<EmrAuditDetail> list = dao.selectedAudit(TokenUtil.getTokenUserId());
         Map<String, List<EmrAuditDetail>> groupMedicalRecords = list.stream().collect(
-                Collectors.groupingBy(EmrAuditDetail::getEmrName)
+                Collectors.groupingBy(item -> item.getEmrName() + "_" + item.getPatNo() + "_" + item.getTimes())
         );
         js.put("timeQualityControl", qualityControlOfMedicalRecords(patInfo, null));
         js.put("emrSuggestion", groupMedicalRecords);