又是重复命名的bug

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

@@ -175,8 +175,8 @@ public interface UpIdCollectionDao {
 
     @Select("select isnull(audit_flag,0) from t_yb_setl_modify_req where pat_no = #{patNo} " +
             "and times = #{times}")
-    Integer setlModifyReq(@Param("patNo") String patNo,
-                          @Param("times") Integer times);
+    Integer setlModifyReqAuditFlag(@Param("patNo") String patNo,
+                                   @Param("times") Integer times);
 
     // 基金支付信息
     @Select("select fund_pay_type,fund_payamt=cast(fund_payamt as decimal(16,2)) from t_si_setldetail " +
@@ -465,8 +465,12 @@ public interface UpIdCollectionDao {
 
 
     @Insert("insert into t_yb_setl_modify_req (pat_no, times, req_op_id, req_op_name, req_remark) " +
-            "values (#{inpatientNo},#{admissTimes},#{opIdCode},#{opIdName},#{reqRemark})")
-    void setlModifyReq(ZyInactpatient param);
+            "values (#{patNo},#{times},#{opIdCode},#{opIdName},#{reqRemark})")
+    void setlModifyReq(@Param("patNo") String patNo,
+                       @Param("times") Integer times,
+                       @Param("opIdCode") String opIdCode,
+                       @Param("opIdName") String opIdName,
+                       @Param("reqRemark") String reqRemark);
 
     @Insert("<script>" +
             "insert into ${tableName} (inpatient_no, admiss_times, dis_diag_no, dis_diag_type, dis_diag, dis_diag_comment, " +

src/main/java/thyyxxk/webserver/entity/medicalinsurance/inpatient/ZyInactpatient.java

@@ -860,11 +860,6 @@ public class ZyInactpatient implements Serializable {
     private Integer ledgerSn;
 
 
-    public String getPatNo() {
-        return this.inpatientNo;
-    }
-
-
     /**
      * 申报类型
      */

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

@@ -105,7 +105,7 @@ public class SetlListUpldService {
 
     public ResultVo<UpldCollection> getUploadInfo(String patNo, Integer times, Integer ledgerSn) throws Exception {
         log.info("住院号：{}，次数：{}，账页：{}", patNo, times, ledgerSn);
-        Integer setlModifyReq = dao.setlModifyReq(patNo, times);
+        Integer setlModifyReqAuditFlag = dao.setlModifyReqAuditFlag(patNo, times);
 
         SetlinfoUpld setlinfoUpld = dao.setlinfo1(patNo, times, ledgerSn);
         if (StringUtil.isBlank(setlinfoUpld.getSetlId())) {
@@ -136,7 +136,7 @@ public class SetlListUpldService {
         setlinfoUpld.setHsorgOpter("未知");
         setlinfoUpld.setBillNo(dao.billNo(patNo, times, ledgerSn));
         // 手术
-        List<OprninfoUpld> oprninfoUpld = dao.oprninfoUplds(patNo, times, setlModifyReq == 1 ? "batj_ba4_modify" : "batj_ba4");
+        List<OprninfoUpld> oprninfoUpld = dao.oprninfoUplds(patNo, times, setlModifyReqAuditFlag == 1 ? "batj_ba4_modify" : "batj_ba4");
 
         if (ListUtil.notBlank(oprninfoUpld)) {
             // 用来存放最大的手术级别
@@ -229,7 +229,7 @@ public class SetlListUpldService {
 
 
         List<PayinfoUpld> payinfo = dao.payinfoUpld(patNo, times, ledgerSn);
-        List<DiseinfoUpld> diseinfos = dao.diseinfo(patNo, times, setlModifyReq == 1 ? "zy_dis_diag_yb_modify" : "zy_dis_diag_yb");
+        List<DiseinfoUpld> diseinfos = dao.diseinfo(patNo, times, setlModifyReqAuditFlag == 1 ? "zy_dis_diag_yb_modify" : "zy_dis_diag_yb");
 
         UpldCollection upldCollection = new UpldCollection();
         // 患者的基本信息
@@ -571,11 +571,9 @@ 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()) {
@@ -587,6 +585,9 @@ public class SetlListUpldService {
                 if (StringUtil.isBlank(item.getDisDiag())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请填写诊断。");
                 }
+                if (StringUtil.isBlank(item.getSiDiagType())) {
+                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "诊断类别不能为空。");
+                }
             }
         }
         int ssxh = 0;
@@ -632,7 +633,8 @@ public class SetlListUpldService {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "不可以有相同的手术编码。");
         }
         dao.delReq(param.getInpatientNo(), param.getAdmissTimes());
-        dao.setlModifyReq(param);
+        dao.setlModifyReq(param.getInpatientNo(), param.getAdmissTimes(),
+                param.getOpIdCode(), param.getOpIdName(), param.getReqRemark());
         if (ListUtil.notBlank(param.getYbZyDisDiag())) {
             dao.setlModDis(param.getYbZyDisDiag(), "zy_dis_diag_yb_modify");
         }