结算单 审核的 bug

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -174,7 +174,7 @@ public interface UpIdCollectionDao {
                   @Param("ledgerSn") Integer ledgerSn);
 
     @Select("select isnull(audit_flag,0) from t_yb_setl_modify_req where pat_no = #{patNo} " +
-            "and admissTimes = #{admissTimes}")
+            "and times = #{times}")
     Integer setlModifyReq(@Param("patNo") String patNo,
                           @Param("times") Integer times);
 

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -571,6 +571,11 @@ public class SetlListUpldService {
         param.setLedgerSn(publicServer.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes()));
         Set<String> zhenDuanBianMa = new HashSet<>();
         Set<String> shouShuBianMa = new HashSet<>();
+
+        if (param.getYbZyDisDiag().get(0).getAdmissCond() == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "主诊断中的入院病情不能为空。");
+        }
+
         for (YbZyDisDiag item : param.getYbZyDisDiag()) {
             zhenDuanBianMa.add(item.getDisDiag());
             if (item.getNewData()) {
@@ -579,9 +584,6 @@ public class SetlListUpldService {
                 item.setOpDiagDate(new Date());
                 item.setOpIdCode(param.getOpIdCode());
             } else {
-                if (item.getAdmissCond() == null) {
-                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("诊断为【%s】请填写出院病情,出院病情不能为 0 。", item.getDisDiagComment()));
-                }
                 if (StringUtil.isBlank(item.getDisDiag())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请填写诊断。");
                 }
@@ -657,6 +659,7 @@ public class SetlListUpldService {
 //            dao.delYuanShuJu(req.getPatNo(), req.getTimes());
 //            dao.auditTongGuo(req.getPatNo(), req.getTimes());
             dao.updateReq(id, remark, auditStaff, auditName);
+            dao.upAuditFlag(id, auditFlag);
             return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "审核已通过 (*^▽^*)");
         }
         if (StringUtil.isBlank(remark)) {