优化

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>9.2</version>
+    <version>9.5</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
 

src/main/java/thyyxxk/webserver/dao/his/querydata/CovidVaccinateAppointmentDao.java

@@ -136,7 +136,6 @@ public interface CovidVaccinateAppointmentDao {
             "name=#{name},enable_flag=#{enableFlag} where code =#{code}")
     void xiuGaiChangJia(CovidVaccinateFactory param);
 
-
     /**
      * 删除厂家 根据code来删除
      *
@@ -169,17 +168,15 @@ public interface CovidVaccinateAppointmentDao {
      *
      * @param code     厂家的code
      * @param dateList 七天的日期
-     * @param value    阈值 从一开始就获取到的
      */
     @Insert("<script>" +
             "insert into t_covid_vaccinate_threshold_new (code, date, value) values " +
             "<foreach collection='dateList' item='item' separator=','>" +
-            "(#{code},#{item},#{value})" +
+            "(#{code},#{item},0)" +
             "</foreach>" +
             "</script>")
     void chaRuMeiYouDeDate(@Param("code") int code,
-                           @Param("dateList") List<Date> dateList,
-                           @Param("value") int value);
+                           @Param("dateList") List<Date> dateList);
 
     /**
      * 查看阈值
@@ -194,11 +191,21 @@ public interface CovidVaccinateAppointmentDao {
                                                     @Param("startTime") String startTime,
                                                     @Param("endTime") String endTime);
 
+    /**
+     * 单个修改新冠可以预约的厂家
+     *
+     * @param code       厂家编码
+     * @param enableFlag 可否预约 0 - 关 、 1 - 开
+     */
     @Update("update t_covid_vaccinate_factory set enable_flag=#{enableFlag} where code = #{code}")
     void kaiQiHuoGuanBiYuYue(@Param("code") Integer code,
                              @Param("enableFlag") Integer enableFlag);
 
-
+    /**
+     * 单个插入当前时间的阈值 默认为 0
+     *
+     * @param code 厂家的编码
+     */
     @Insert("insert into t_covid_vaccinate_threshold_new (code, date, value) values (#{code},convert(char(10),getdate(),120),0)")
     void chaRuJinRiYuZhi(Integer code);
 

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

@@ -86,15 +86,15 @@ public interface TransferInOfExpensesDao {
             "</script> ")
     List<ZyDetailCharge> getZyJiMenZhenZhuangRuFeiYong(IPage<ZyDetailCharge> page,
                                                        @Param("inpatientNo") String inpatientNo,
-                                                       @Param("chargeCodeMX") String chargeCodeMX
-    );
+                                                       @Param("chargeCodeMX") String chargeCodeMX);
 
     /**
      * 删除病人通过急门诊转入的费用 数据
      *
      * @param param 删除的条件
      */
-    @Delete("delete zy_detail_charge where inpatient_no=#{inpatientNo} and  admiss_times =#{admissTimes} and ledger_sn=#{ledgerSn} and detail_sn=#{detailSn}")
+    @Delete("delete from zy_detail_charge where inpatient_no=#{inpatientNo} and " +
+            "admiss_times =#{admissTimes} and ledger_sn=#{ledgerSn} and detail_sn=#{detailSn}")
     void shanChuFeiYong(ZyDetailCharge param);
 
     /**
@@ -117,6 +117,13 @@ public interface TransferInOfExpensesDao {
             "</script>")
     void insertInfoZyDetailCharge(@Param("info") ZyActpatient info, @Param("list") List<MzChargeDetail> zyFees);
 
+    /**
+     * 查询出这个患者的最大流水号，在新增费用的时候要加一
+     *
+     * @param inpatientNo 住院号
+     * @param admissTimes 住院次数
+     * @return 返回最大的流水号
+     */
     @Select("select isnull(max(detail_sn),0) from zy_detail_charge where inpatient_no=#{inpatientNo} and admiss_times=#{admissTimes}")
     Integer getMaxDetailSn(@Param("inpatientNo") String inpatientNo,
                            @Param("admissTimes") Integer admissTimes);

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

@@ -92,32 +92,31 @@ public class CovidVaccinateAppointmentService {
         Date maxDate = dao.changJiaYuZhiDoesItExist(code);
         List<Date> dateList = new ArrayList<>();
         //设置默认插入的阈值
-        int value = 0;
         Date date;
         for (int i = 1; i <= GET_DATE_SECTION; i++) {
             date = SDF.parse(DateUtil.getOffsetDate(i));
             if (maxDate == null) {
                 dateList.add(date);
-                log.info("新冠疫苗插入默认设置阈值 --> code：{}，插入的日期为：{}，阈值数：{}", code, DateUtil.formatDatetime(date, DATE_FORMAT), value);
+                log.info("新冠疫苗插入默认设置阈值 --> code：{}，插入的日期为：{}", code, DateUtil.formatDatetime(date, DATE_FORMAT));
             } else if (maxDate.getTime() < date.getTime()) {
                 dateList.add(date);
-                log.info("新冠疫苗厂家阈值插入 --> code：{}，添加日期为：{},阈值数：{}", code, DateUtil.formatDatetime(date, DATE_FORMAT), value);
+                log.info("新冠疫苗厂家阈值插入 --> code：{}，添加日期为：{}", code, DateUtil.formatDatetime(date, DATE_FORMAT));
             }
         }
         //因为在 查看的时候 也是需要 执行 要判断一下 只有日期为空的时候才会插入
         if (dateList.size() > 0) {
-            dao.chaRuMeiYouDeDate(code, dateList, value);
+            dao.chaRuMeiYouDeDate(code, dateList);
         }
     }
 
     /**
-     * 查询指定的数据然后导出
+     * 导出新冠疫苗的 Excel 表格
      *
      * @param response 返回数据
      * @param param    name姓名  ExecuteDate预约时间  currentPage=1  PageSize=-1 这样写才能导出全部的数据
      */
     public void exportExcel(HttpServletResponse response, CovidVaccinateAppointment param) {
-        log.info("导出新冠疫苗excel: {}", JSON.toJSONString(param));
+        log.info("导出新冠疫苗excel: {}", JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
         List<CovidVaccinateAppointment> list = getQueryPage(param).getRecords();
         String[] title = {"门诊id", "姓名", "性别", "联系电话", "身份证号", "年龄", "工作单位", "工作性质", "预约接种时间", "产品编码", "产品名称", "疫苗厂商"};
         String[][] content = new String[list.size()][];
@@ -289,5 +288,4 @@ public class CovidVaccinateAppointmentService {
                 String.format("操作成功 --> %s", enableFlag == 0 ? "<span style='color:red'>关闭预约</span>" :
                         "<span style='color:#67C23A'>开启预约</span>"));
     }
-
 }

src/main/java/thyyxxk/webserver/service/yibao/SettleService.java

@@ -116,7 +116,7 @@ public class SettleService {
         log.info("正负相抵完成：{}，共抵消 {} 条费用。", overview.getLogBody(), count);
     }
 
-    @SuppressWarnings({"rawtypes","unchecked"})
+    @SuppressWarnings({"rawtypes", "unchecked"})
     public ResultVo<String> calculateCost(Patient param, String responce) {
         final String url = YbLinksUtil.getCompleteUrl("calculateCost", responce);
         if ("selfPay".equals(url)) {

src/main/java/thyyxxk/webserver/service/yibao/TransferInOfExpensesService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
@@ -35,6 +36,7 @@ public class TransferInOfExpensesService {
 
     private final TransferInOfExpensesDao dao;
 
+    @Autowired
     public TransferInOfExpensesService(TransferInOfExpensesDao dao) {
         this.dao = dao;
     }
@@ -106,7 +108,7 @@ public class TransferInOfExpensesService {
     public ResultVo<String> shanChuFeiYong(ZyDetailCharge param) {
         log.info("删除该患者通过急门诊转入的费用 --> 操作员：{}， 通过主键来删除数据：{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(param, GetDateFormat.DATE_TIME));
         dao.shanChuFeiYong(param);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功 φ(0￣*)啦啦啦_φ(*￣0￣)′");
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功 ୧(๑•̀◡•́๑)૭");
     }
 
     /**
@@ -125,8 +127,8 @@ public class TransferInOfExpensesService {
             mzChargeDetail.setDetailSn(maxDetailSn += 1);
         }
         dao.insertInfoZyDetailCharge(param, list);
-        log.info("急门诊费用插入数据：{}", JSON.toJSONStringWithDateFormat(param, GetDateFormat.DATE_TIME));
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "添加成功");
+        log.info("急门诊费用插入 --> 操作人：{} ， 数据：{}", param.getStaffId(), JSON.toJSONStringWithDateFormat(param, GetDateFormat.DATE_TIME));
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "急门诊费用转入成功。");
     }
 
     /**