电子病历的审核现在不会覆盖了

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

@@ -299,16 +299,9 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "  , #{zyDetailCharge.opIdCode}, #{item.chargeCode}, #{infantFlag}, '2', cast(#{item.chargeAmount,jdbcType=DECIMAL} as decimal(14,5))  " +
             "  , '0', '0', NULL, #{zyDetailCharge.ward}, #{zyDetailCharge.dept}  " +
             "  , #{item.orderNo}, '0', #{item.deptCode}, cast(#{item.amount,jdbcType=DECIMAL} as decimal(14,5)), getdate()  " +
-            "  , #{zyDetailCharge.zySerialNo}, #{item.chargeCodeMx}, #{item.serial},#{zyDetailCharge.ssCode}," +
-            // 是否医保报销 标志 默认为空值
-            "<if test=\"item.ybSelfFlag == null\">" +
-            "0" +
-            "</if>" +
-            "<if test=\"item.ybSelfFlag != null\">" +
-            "#{item.ybSelfFlag}" +
-            "</if>" +
-            ",#{zyDetailCharge.referPhysician}," +
-            "null)" +
+            "  , #{zyDetailCharge.zySerialNo}, #{item.chargeCodeMx}, #{item.serial},#{zyDetailCharge.ssCode}" +
+            "  ,#{item.ybSelfFlag} " +
+            ",#{zyDetailCharge.referPhysician},null)" +
             "</foreach>" +
             "</script>")
     void chaRuFeiYong(@Param("zyDetailCharge") ZyDetailCharge zyDetailCharge,

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

@@ -14,9 +14,6 @@ import java.util.List;
 @Mapper
 public interface EmrAuditDao extends BaseMapper<EmrAuditDetail> {
 
-    @Update("update emr_audit_detail set history = 1 where emr_id = #{id} and final_control = #{finalControl} and level = #{level} ")
-    void setAuditHistoryByEmrId(Integer id, Integer finalControl, Integer level);
-
     @Insert("<script>" +
             "insert into emr_audit_detail (pat_no,times,approver, review_time, name, scoring_criteria, remark, " +
             "number_of_defects, emr_id, history , doctor , final_control,level,minus_points) " +
@@ -30,7 +27,7 @@ public interface EmrAuditDao extends BaseMapper<EmrAuditDetail> {
                      @Param("times") Integer times,
                      @Param("id") Integer id,
                      @Param("doctor") String doctor,
-                     @Param("level")  Integer level,
+                     @Param("level") Integer level,
                      @Param("list") List<EmrAuditDetail> list);
 
     @Update("UPDATE emr_audit_detail " +

src/main/java/thyyxxk/webserver/service/inpatient/xmlr/XiangMuLuRuService.java

@@ -180,6 +180,17 @@ public class XiangMuLuRuService {
             qw.eq("ori_detail_sn", -1);
         }
 
+        Integer order = params.getFeeSources();
+
+        if (order != 2 && order != 1) {
+            qw.eq("order_no", order);
+        }
+
+        if (order == 1) {
+            qw.gt("len(order_no)", new BigDecimal(2));
+        }
+
+
         qw.orderBy(true, params.getOrderBy(), "charge_date");
         return qw;
     }
@@ -497,6 +508,9 @@ public class XiangMuLuRuService {
                 shenQing.setChargeAmount((zyDetailCharge.getAmount()));
                 yaoPingShenQingDan.add(shenQing);
             }
+            if (zyDetailCharge.getSelfFlag() == null) {
+                zyDetailCharge.setSelfFlag("0");
+            }
         }
         Integer ledgerSn = publicServer.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes());
         // 在此处 插入费用

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

@@ -8,6 +8,7 @@ import thyyxxk.webserver.dao.his.zhuyuanyisheng.emr.EmrAuditDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrAuditDetail;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrSetAudit;
+import thyyxxk.webserver.service.PublicServer;
 import thyyxxk.webserver.utils.ListUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
@@ -18,9 +19,11 @@ import java.util.*;
 @Slf4j
 public class EmrAuditServer {
     private final EmrAuditDao dao;
+    private final PublicServer publicServer;
 
-    public EmrAuditServer(EmrAuditDao dao) {
+    public EmrAuditServer(EmrAuditDao dao, PublicServer publicServer) {
         this.dao = dao;
+        this.publicServer = publicServer;
     }
 
     public ResultVo<String> setAudit(EmrSetAudit data) {
@@ -28,12 +31,9 @@ public class EmrAuditServer {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择质控数据");
         }
         String userCode = TokenUtil.getInstance().getTokenUserId();
-
         // 防止有重复的审核项目
         Set<String> auditSet = new HashSet<>();
-
         Date now = new Date();
-
         data.getList().forEach(item -> {
             auditSet.add(item.getName());
             item.setApprover(userCode)
@@ -45,7 +45,6 @@ public class EmrAuditServer {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请勿添加重复审核项目。");
         }
 
-        dao.setAuditHistoryByEmrId(data.getId(), data.getFinalControl(), data.getLevel());
         dao.insertAudit(data.getPatNo(), data.getTimes(), data.getId(), data.getDoctor(), data.getLevel(), data.getList());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE);
     }
@@ -120,8 +119,13 @@ public class EmrAuditServer {
 
 
     public ResultVo<String> deleteEmrAuditByEmrId(String id) {
-        dao.deleteById(id);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE);
+        EmrAuditDetail emrAuditDetail = dao.selectById(id);
+        if (publicServer.needRule(78) || emrAuditDetail.getRemark().equals(TokenUtil.getInstance().getTokenUserId())) {
+            dao.deleteById(id);
+            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE);
+        }
+        return ResultVoUtil.fail(ExceptionEnum.ERROR_MESSAGE, "您没有权限删除");
+
     }
 
 

src/main/resources/application-cytest.yml

@@ -15,7 +15,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: his
+      primary: dev
       strict: false
       datasource:
         his: