修改bug急门诊多个转入会丢失精度。

src/main/java/thyyxxk/webserver/dao/his/yibao/TransferInOfExpensesDao.java

@@ -49,7 +49,7 @@ public interface TransferInOfExpensesDao {
      * @param serialNo  机制号
      * @return 返回多个
      */
-    @Select("select unit_price charge_fee,quantity charge_amount,unit_price,tc_name,quantity,patient_id,times,receipt_no,order_no," +
+    @Select("select unit_price charge_fee,quantity charge_amount,Convert(decimal(18,2),unit_price)unit_price,tc_name,quantity,patient_id,times,receipt_no,order_no," +
             "item_no,charge_item_code charge_code_mx,charge_item_code charge_code,doctor_code," +
             "detail_flag detail_sn," +
             "receipt_no,real_no,charge_date,self_flag,charge_bill_code,serial,serial_no " +
@@ -109,7 +109,7 @@ public interface TransferInOfExpensesDao {
             "gen_time,charge_code_mx,serial,doctor_code,trans_flag_yb,refer_physician,consult_physician) VALUES " +
             "<foreach collection='list' item='fee' separator=',' open='' close=''>" +
             "(#{info.inpatientNo}, #{info.admissTimes}, #{info.ledgerSn}, #{fee.detailSn}, getDate(), #{info.staffId}, " +
-            "#{fee.chargeCode}, 0, 2, #{fee.chargeAmount}, #{fee.chargeFee}, #{info.wardCode}, #{info.deptCode}, 6, " +
+            "#{fee.chargeCode}, 0, 2, #{fee.chargeAmount}, cast(#{fee.chargeFee,jdbcType=DECIMAL} as decimal(14,5)), #{info.wardCode}, #{info.deptCode}, 6, " +
             "#{info.operation},getDate(), #{fee.chargeCodeMx},#{fee.serial},#{fee.doctorCode},0,#{info.referPhysician}," +
             "#{info.consultPhysician})" +
             "</foreach>" +

src/main/java/thyyxxk/webserver/entity/casefrontsheet/CaseFrontsheetDisdiag.java

@@ -1,11 +1,10 @@
 package thyyxxk.webserver.entity.casefrontsheet;
 
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author dj
  */
@@ -13,46 +12,46 @@ import lombok.Data;
 @TableName(value = "t_case_frontsheet_disdiag")
 public class CaseFrontsheetDisdiag implements Serializable {
 
-	private static final long serialVersionUID =  3243613220628792569L;
-
-	/**
-	 * 病案号（和住院号一样）
-	 */
-	private String bah;
-
-	/**
-	 * 住院次数
-	 */
-	private Integer times;
-
-	/**
-	 * 诊断序号
-	 */
-	private Integer no;
-
-	/**
-	 * 诊断名称
-	 */
-	private String name;
-
-	/**
-	 * 诊断编码
-	 */
-	private String code;
-
-	/**
-	 * 入院状态
-	 */
-	private Integer admissStatus;
-
-	/**
-	 * 出院状态
-	 */
-	private Integer dismissStatus;
-
-	/**
-	 * 诊断录入人
-	 */
-	private String opIdCode;
+    private static final long serialVersionUID = 3243613220628792569L;
+
+    /**
+     * 病案号（和住院号一样）
+     */
+    private String bah;
+
+    /**
+     * 住院次数
+     */
+    private Integer times;
+
+    /**
+     * 诊断序号
+     */
+    private Integer no;
+
+    /**
+     * 诊断名称
+     */
+    private String name;
+
+    /**
+     * 诊断编码
+     */
+    private String code;
+
+    /**
+     * 入院状态
+     */
+    private Integer admissStatus;
+
+    /**
+     * 出院状态
+     */
+    private Integer dismissStatus;
+
+    /**
+     * 诊断录入人
+     */
+    private String opIdCode;
 
 }

src/main/java/thyyxxk/webserver/service/datamodify/InOrOutOfWarehouseService.java

@@ -75,7 +75,6 @@ public class InOrOutOfWarehouseService {
             return ResultVoUtil.success(dao.queryCode("yp_zd_manufactory", pyCode.toUpperCase() + "%"));
         }
         return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR);
-
     }
 
     /**
@@ -107,7 +106,6 @@ public class InOrOutOfWarehouseService {
         map.put("data", list);
         map.put("total", page.getTotal());
         return ResultVoUtil.success(map);
-
     }
 
     /**

src/main/java/thyyxxk/webserver/service/querydata/CovidVaccinateAppointmentService.java

@@ -227,7 +227,8 @@ public class CovidVaccinateAppointmentService {
     public ResultVo<Boolean> xiuGaiYiMiao(ZdCovidVaccinate param) {
         log.info("修改疫苗 --> 操作人：{}，数据：{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
         dao.xiuGaiYiMiao(param);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, String.format("<p style='color:#67C23A'>%s</p>修改成功 ＼(☆o☆)／", param.getName()));
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION,
+                String.format("<p style='color:#67C23A'>%s</p>修改成功 ＼(☆o☆)／", param.getName()));
     }
 
     /**
@@ -239,7 +240,8 @@ public class CovidVaccinateAppointmentService {
     public ResultVo<Boolean> xiuGaiChangJia(CovidVaccinateFactory param) {
         log.info("修改新冠疫苗厂家 --> 操作人：{}，数据：{}", TokenUtil.getTokenUserId(), JSON.toJSONString(param));
         dao.xiuGaiChangJia(param);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, String.format("<p style='color:teal'>%s</p>厂家信息修改成功 φ(゜▽゜*)♪<br>需刷新页面", param.getName()));
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION,
+                String.format("<p style='color:teal'>%s</p>厂家信息修改成功 φ(゜▽゜*)♪<br>需刷新页面查看效果。", param.getName()));
     }
 
     /**
@@ -249,7 +251,7 @@ public class CovidVaccinateAppointmentService {
      * @return 返回
      */
     public ResultVo<Boolean> shanChuChangJia(Integer code) {
-        log.info("删除新冠疫苗厂家 --> 操作人：{}，删除的数据：{}", TokenUtil.getTokenUserId(), code);
+        log.info("删除新冠疫苗厂家 --> 操作人：{}，删除的code：{}", TokenUtil.getTokenUserId(), code);
         dao.shanChuChangJia(code);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功 ＼(☆o☆)／");
     }
@@ -266,8 +268,15 @@ public class CovidVaccinateAppointmentService {
         return ResultVoUtil.success();
     }
 
+    /**
+     * 开启或关闭该厂家的预约
+     *
+     * @param code       厂家编码
+     * @param enableFlag 0-关闭  1-开启
+     * @return 返回通知
+     */
     public ResultVo<Boolean> kaiQiHuoGuanBiYuYue(Integer code, Integer enableFlag) {
-        log.info("1-开启、0-关闭厂家为：{} 的预约，操作：{},操作人：{}", code, enableFlag, TokenUtil.getTokenUserId());
+        log.info("1-开启或0-关闭 厂家编码为：{} 的预约，操作：{},操作人：{}", code, enableFlag, TokenUtil.getTokenUserId());
         dao.kaiQiHuoGuanBiYuYue(code, enableFlag);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION,
                 String.format("操作成功 --> %s", enableFlag == 0 ? "<span style='color:red'>关闭预约</span>" :