瀏覽代碼

完成项目退费

DESKTOP-0GD05B0\Administrator 2 年之前
父節點
當前提交
39edaad64d

+ 2 - 1
src/main/java/thyyxxk/webserver/dao/his/inpatient/XiangMuLuRuDao.java

@@ -136,7 +136,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
                                    @Param("tuiFeiFlag") Integer tuiFeiFlag);
 
     @Select("<script>" +
-            "            SELECT a.admiss_times, " +
+            "            SELECT " +
+            "                   a.admiss_times, " +
             "                   a.inpatient_no, " +
             "                   a.order_no,    " +
             "                   a.gen_time,      " +

+ 10 - 0
src/main/java/thyyxxk/webserver/entity/datamodify/ZyDetailCharge.java

@@ -32,6 +32,16 @@ public class ZyDetailCharge implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+    /**
+     * 行 id
+     */
+    private String rowId;
+
+    public String getRowId() {
+        return inpatientNo + admissTimes + ledgerSn + detailSn;
+    }
+
     @TableId(value = "inpatient_no", type = IdType.ID_WORKER)
     @NotNull(message = "住院号不能为空1")
     @NotBlank(message = "住院号不能为空")

+ 1 - 1
src/main/java/thyyxxk/webserver/service/inpatient/XiangMuLuRuService.java

@@ -206,7 +206,7 @@ public class XiangMuLuRuService {
                     drug.add(item);
                     updateDrugLabel.add(item.getDetailSn());
                     // todo 要开启把这个代码注释掉
-                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号:【%s】,药品无法退费。", item.getDetailSn()));
+//                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号:【%s】,药品无法退费。", item.getDetailSn()));
                 }
 
             }