Browse Source

修改格式

xiaochan 4 years ago
parent
commit
59ad64c681

+ 6 - 0
pom.xml

@@ -92,6 +92,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--PostgreSQL数据库 创智的中台数据-->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.20</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit-test</artifactId>

+ 3 - 3
src/main/java/thyyxxk/webserver/controller/casefrontsheet/CaseFrontSheetController.java

@@ -61,8 +61,8 @@ public class CaseFrontSheetController {
 
     @GetMapping("/getSheetInfo")
     public ResultVo<CaseFrontsheetMain> getPatientInfo(@RequestParam("bah") String bah,
-                                              @RequestParam("times") Integer times,
-                                              @RequestParam("flag") Integer flag) {
+                                                       @RequestParam("times") Integer times,
+                                                       @RequestParam("flag") Integer flag) {
         return service.getPatientInfo(bah, times, flag);
     }
 
@@ -122,5 +122,5 @@ public class CaseFrontSheetController {
     public ResultVo<PureCodeName> fetchSsfz(@RequestParam("code") String code) {
         return service.fetchSsfz(code);
     }
-
+    
 }

+ 7 - 6
src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/CaseFrontSheetDao.java

@@ -701,16 +701,17 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
 
 
     @Select("select count(1) from t_case_frontsheet_main where bah=#{bah} and admiss_times=#{admissTimes}")
-    Integer bingAnQianShouZhuangTai(@Param("bah")String bah,
-                                    @Param("admissTimes")Integer admissTimes);
+    Integer bingAnQianShouZhuangTai(@Param("bah") String bah,
+                                    @Param("admissTimes") Integer admissTimes);
 
     @Select("select file_status from t_case_frontsheet_main where bah=#{bah} and admiss_times=#{admissTimes}")
-    Integer selectFileStatus(@Param("bah")String bah,
-                             @Param("admissTimes")Integer admissTimes);
+    Integer selectFileStatus(@Param("bah") String bah,
+                             @Param("admissTimes") Integer admissTimes);
 
     @Update("update t_case_frontsheet_main set file_status=#{status} where bah=#{bah} and admiss_times=#{admissTimes}")
-    void updateFileStatus(@Param("bah")String bah,
-                          @Param("admissTimes")Integer admissTimes,
+    void updateFileStatus(@Param("bah") String bah,
+                          @Param("admissTimes") Integer admissTimes,
                           @Param("status") int status);
 
+
 }

+ 0 - 1
src/main/java/thyyxxk/webserver/dao/his/datamodify/YzActOrderModifyVerifyDao.java

@@ -43,7 +43,6 @@ public interface YzActOrderModifyVerifyDao extends BaseMapper<TYzActOrderModify>
                           @Param("endTime") Date endTime,
                           @Param("actOrderNo") BigDecimal actOrderNo);
 
-
     /**
      * 医嘱修改数据撤回 在这里开始时间要和医嘱时间一起改变
      *

+ 11 - 3
src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetService.java

@@ -13,6 +13,7 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.casefrontsheet.*;
 import thyyxxk.webserver.entity.dictionary.PureCodeName;
 import thyyxxk.webserver.utils.*;
+
 import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -112,6 +113,12 @@ public class CaseFrontSheetService {
         return ResultVoUtil.success(dao.getOutPatients(param));
     }
 
+    /**
+     * 查询病案首页汇总
+     *
+     * @param param 查询的条件
+     * @return 返回数据
+     */
     public ResultVo<GetBasOverviewRet> getOutPatientForBas(GetOutSheetParam param) {
         GetBasOverviewRet ret = new GetBasOverviewRet();
         if (!StringUtil.isBlank(param.getWard())) {
@@ -164,6 +171,7 @@ public class CaseFrontSheetService {
         return ResultVoUtil.success(ret);
     }
 
+
     public ResultVo<CaseFrontsheetMain> getPatientInfo(String bah, Integer times, Integer flag) {
         log.info("病案首页获取病人信息>>> 住院号:{},住院次数:{},在院状态:{}", bah, times, flag);
         CaseFrontsheetMain sheet = dao.getAPatientMi(bah);
@@ -332,7 +340,7 @@ public class CaseFrontSheetService {
                     for (CaseFrontsheetDisdiag caseFrontsheetDisdiag : sheet.getDisdiagList()) {
                         caseFrontsheetDisdiag.setBah(sheet.getBah());
                         caseFrontsheetDisdiag.setTimes(sheet.getAdmissTimes());
-                        if (caseFrontsheetDisdiag.getNo()!=null){
+                        if (caseFrontsheetDisdiag.getNo() != null) {
                             createdDao.insert(caseFrontsheetDisdiag);
                         }
                     }
@@ -340,13 +348,13 @@ public class CaseFrontSheetService {
                     for (CaseFrontsheetSurgery caseFrontsheetSurgery : sheet.getSurgeryList()) {
                         caseFrontsheetSurgery.setBah(sheet.getBah());
                         caseFrontsheetSurgery.setTimes(sheet.getAdmissTimes());
-                        if (caseFrontsheetSurgery.getNo()!=null){
+                        if (caseFrontsheetSurgery.getNo() != null) {
                             basDao.insert(caseFrontsheetSurgery);
                         }
                     }
                     return ResultVoUtil.success("签收成功。");
                 }
-                if (0 == fileStatus ) {
+                if (0 == fileStatus) {
                     dao.updateFileStatus(sheet.getBah(), sheet.getAdmissTimes(), 1);
                     return ResultVoUtil.success("签收成功。");
                 }

+ 1 - 1
src/main/java/thyyxxk/webserver/service/datamodify/SecondFefundService.java

@@ -41,7 +41,7 @@ public class SecondFefundService {
     }
 
     public ResultVo<MzChargeDetail> xiuGaiTuiFei(String patientId, Integer times, String chargeItemCode, Integer quantity) {
-        log.info("修改二次退费:操作人:{},门诊号:{},次数:{},收费编码:{},退费数量:{}", TokenUtil.getTokenUserId(), patientId, times, chargeItemCode, quantity);
+        log.info("修改二次退费 --> 操作人:{},门诊号:{},次数:{},收费编码:{},退费数量:{}", TokenUtil.getTokenUserId(), patientId, times, chargeItemCode, quantity);
         dao.xiuGaiTuiFei(patientId, times, chargeItemCode, quantity);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "修改成功。");
     }

+ 3 - 3
src/main/java/thyyxxk/webserver/service/datamodify/YzActOrderModifyService.java

@@ -46,7 +46,7 @@ public class YzActOrderModifyService {
      */
     public ResultVo<List<YzActOrder>> queryYz(YzActOrder param) {
         QueryWrapper<YzActOrder> qw = new QueryWrapper<>();
-        log.info("医嘱修改申请查询==》医嘱号:{},住院号:{}", param.getActOrderNo(), param.getInpatientNo());
+        log.info("医嘱修改申请查询 --> 医嘱号:{},住院号:{}", param.getActOrderNo(), param.getInpatientNo());
         if (param.getActOrderNo() != null) {
             qw.eq("a.act_order_no", param.getActOrderNo());
         }
@@ -67,7 +67,7 @@ public class YzActOrderModifyService {
      * @return 返回提示
      */
     public ResultVo<Boolean> yzModifyApply(TYzActOrderModify param) {
-        log.info("申请医嘱修改==》申请人:{},数据:{}",
+        log.info("申请医嘱修改 --> 申请人:{},数据:{}",
                 TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
         List<TYzActOrderModify> insertList = new ArrayList<>();
         List<TYzActOrderModify> updateList = new ArrayList<>();
@@ -108,7 +108,7 @@ public class YzActOrderModifyService {
      */
     public ResultVo<String> danGeShenQing(TYzActOrderModify param) {
         param.setProposer(TokenUtil.getTokenUserId());
-        log.info("申请医嘱修改==》申请人:{},数据:{}", param.getProposer(), JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
+        log.info("申请医嘱修改 --> 申请人:{},数据:{}", param.getProposer(), JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
         if (dao.chaKansfCunZai(param.getActOrderNo()) == 0) {
             dao.danGeShenQingInsert(param);
         } else {

+ 6 - 6
src/main/java/thyyxxk/webserver/service/datamodify/YzActOrderModifyVerifyService.java

@@ -48,7 +48,7 @@ public class YzActOrderModifyVerifyService {
      * @return 返回审核的信息
      */
     public ResultVo<List<TYzActOrderModify>> chaKanZhuangTai(TYzActOrderModify param) {
-        log.info("查询医嘱审核状态==》操作员:{},医嘱号:{},住院号:{},状态值:{}",
+        log.info("查询医嘱审核状态 --> 操作员:{},医嘱号:{},住院号:{},状态值:{}",
                 TokenUtil.getTokenUserId(), param.getActOrderNo(), param.getInpatientNo(), param.getAuditFlag());
         QueryWrapper<TYzActOrderModify> qw = new QueryWrapper<>();
 
@@ -112,31 +112,31 @@ public class YzActOrderModifyVerifyService {
         obj.put("name", "systemNotification");
         if (auditFlag == YZ_APPROVED) {
             if (judgeTheTime(pojo)) {
-                dao.shenHeZhuangTaiGaiBian(3, TokenUtil.getTokenUserId(), actOrderNo, "结束时间不能在开始时间前面。");
+                dao.shenHeZhuangTaiGaiBian(YZ_REJECT, TokenUtil.getTokenUserId(), actOrderNo, "结束时间不能在开始时间前面。");
                 obj.put("type", "error");
                 obj.put("message", String.format("用户【%s】,医嘱号为【%s】已驳回,<br>驳回原因:%s", pojo.getProposerName(), actOrderNo, "结束时间不能在开始时间前面。"));
-                log.info("医嘱修改审核操作:{自动驳回},操作员:{},驳回医嘱号:{}", TokenUtil.getTokenUserId(), pojo.getActOrderNo());
+                log.info("医嘱修改审核 --> 操作:{自动驳回},操作员:{},驳回医嘱号:{}", TokenUtil.getTokenUserId(), pojo.getActOrderNo());
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "结束时间不能在开始时间前面,已自动驳回。");
             } else {
                 dao.yzActOrderModify(pojo.getNewStartTime(), pojo.getNewEndTime(), pojo.getActOrderNo());
                 dao.shenHeZhuangTaiGaiBian(auditFlag, TokenUtil.getTokenUserId(), actOrderNo, auditRemark);
                 obj.put("type", "success");
                 obj.put("message", String.format("用户【%s】,医嘱号为【%s】已通过审核。", pojo.getProposerName(), actOrderNo));
-                log.info("医嘱修改成功===>审核人:{},数据:{}",
+                log.info("医嘱修改成功 --> 审核人:{},数据:{}",
                         TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(pojo, GetDateFormat.DATE_TIME));
             }
         } else if (auditFlag == YZ_REJECT) {
             dao.shenHeZhuangTaiGaiBian(auditFlag, TokenUtil.getTokenUserId(), actOrderNo, auditRemark);
             obj.put("message", String.format("用户【%s】,医嘱号为【%s】已驳回,<br>驳回原因:%s。", pojo.getProposerName(), actOrderNo, auditRemark));
             obj.put("type", "error");
-            log.info("医嘱修改审核操作:{驳回},操作员:{},驳回医嘱号:{}", TokenUtil.getTokenUserId(), pojo.getActOrderNo());
+            log.info("医嘱修改审核 --> 操作:{驳回},操作员:{},驳回医嘱号:{}", TokenUtil.getTokenUserId(), pojo.getActOrderNo());
         } else if (auditFlag == YZ_WITHDRAW) {
             //数据回撤
             dao.shuJuHuiChe(pojo.getStartTime(), pojo.getEndTime(), pojo.getActOrderNo());
             dao.shenHeZhuangTaiGaiBian(auditFlag, TokenUtil.getTokenUserId(), actOrderNo, auditRemark);
             obj.put("message", String.format("用户【%s】,医嘱号为【%s】数据撤回,<br >撤回原因:%s。", pojo.getProposerName(), actOrderNo, auditRemark));
             obj.put("type", "error");
-            log.info("医嘱修改审核操作:{数据撤回成功},操作人员:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(pojo, GetDateFormat.DATE_TIME));
+            log.info("医嘱修改审核 --> 操作:{数据撤回成功},操作人员:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(pojo, GetDateFormat.DATE_TIME));
         }
         String message = obj.toJSONString();
         WebSocketServer.sendMessageByUserCode(pojo.getProposer(), message);

+ 3 - 3
src/main/java/thyyxxk/webserver/service/datamodify/YzTemperatureService.java

@@ -46,7 +46,7 @@ public class YzTemperatureService {
         String date = DateUtil.formatDatetime(param.getDate(), GET_DATE_FORMAT);
         String time = DateUtil.formatDatetime(param.getDate(), GET_TIME_FORMAT);
 
-        log.info("查询护理记录单:操作人:{},住院号:{},住院次数:{},日期:{},时间:{}",
+        log.info("查询护理记录单 --> 操作人:{},住院号:{},住院次数:{},日期:{},时间:{}",
                 TokenUtil.getTokenUserId(), param.getInpatientNo(), param.getAdmissTimes(), date, time);
         param.setToStringRecDate(date);
         param.setToStringRecTime(time);
@@ -107,7 +107,7 @@ public class YzTemperatureService {
             }
         }
 
-        log.info("护理记录单修改前操作人:{},修改的记录单日期:{},时间:{},住院次数:{},住院号:{},体温:{}," +
+        log.info("护理记录单修改前 --> 操作人:{},修改的记录单日期:{},时间:{},住院次数:{},住院号:{},体温:{}," +
                         "心率/脉搏:{},呼吸:{},血压am:{},血压pm:{}," +
                         "spo2:{},意识:{},皮肤:{},管道名称:{},管道情况:{},病区:{}",
                 TokenUtil.getTokenUserId(), pojo.getRecDate(), pojo.getRecTime(), pojo.getAdmissTimes(), pojo.getInpatientNo(),
@@ -115,7 +115,7 @@ public class YzTemperatureService {
                 pojo.getPressure1Pm(), pojo.getSpo2(), pojo.getMind(), pojo.getSkin(), pojo.getTubesName(), pojo.getTubesStatus(),
                 pojo.getWard());
 
-        log.info("修改护理记录单后操作人:{},修改的记录单日期:{},时间:{},住院次数:{},住院号:{},体温:{}," +
+        log.info("修改护理记录单后 --> 操作人:{},修改的记录单日期:{},时间:{},住院次数:{},住院号:{},体温:{}," +
                         "心率/脉搏:{},呼吸:{},血压am:{},血压pm:{}," +
                         "spo2:{},意识:{},皮肤:{},管道名称:{},管道情况:{},病区:{}",
                 TokenUtil.getTokenUserId(), param.getToStringRecDate(), param.getToStringRecTime(), param.getAdmissTimes(),

+ 2 - 2
src/main/java/thyyxxk/webserver/service/datamodify/ZyChargeFeeModifyService.java

@@ -43,7 +43,7 @@ public class ZyChargeFeeModifyService {
     public ResultVo<Map<String, Object>> queryHospitalizationExpenses(ZyDetailCharge param) {
         IPage<ZyDetailCharge> page = new Page<>(param.getCurrentPage(), param.getPageSize());
         dao.queryHospitalizationExpenses(page, param.getInpatientNo(), param.getChargeCodeMx());
-        log.info("查看总价格=>住院号{},收费项目码{}", param.getInpatientNo(), param.getChargeCodeMx());
+        log.info("查看总价格 --> 住院号{},收费项目码{}", param.getInpatientNo(), param.getChargeCodeMx());
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
         map.put("data", page.getRecords());
         map.put("total", page.getTotal());
@@ -60,7 +60,7 @@ public class ZyChargeFeeModifyService {
      * @return 返回数据
      */
     public ResultVo<Boolean> totalModify(ZyDetailCharge param) {
-        log.info("修改价格=>操作人员{},住院号{},流水号{},住院次数{},结算次数{},修改前价格{},修改后价格{}",
+        log.info("修改价格 --> 操作人员{},住院号{},流水号{},住院次数{},结算次数{},修改前价格{},修改后价格{}",
                 TokenUtil.getTokenUserId(), param.getInpatientNo(),
                 param.getDetailSn(), param.getAdmissTimes(), param.getLedgerSn(),
                 param.getChargeFee(), param.getNewChargeFee());

+ 1 - 1
src/main/java/thyyxxk/webserver/service/querydata/ConsumablesStatisticsService.java

@@ -52,7 +52,7 @@ public class ConsumablesStatisticsService {
      * @param param    查询条件
      */
     public void exportExcel(HttpServletResponse response, ConsumablesStatistics param) {
-        log.info("导出耗材使用统计excel: {}", JSON.toJSONString(param));
+        log.info("导出耗材使用统计excel --> {}", JSON.toJSONString(param));
         List<ConsumablesStatistics> list = dao.query(param);
         String[] title = {"项目编码", "项目名称", "产地品牌", "耗材院内编码", "来源", "数量", "金额"};
         String[][] content = new String[list.size()][];

+ 10 - 10
src/main/java/thyyxxk/webserver/service/querydata/CovidVaccinateAppointmentService.java

@@ -51,7 +51,7 @@ public class CovidVaccinateAppointmentService {
      * @return 指定数据
      */
     public ResultVo<Map<String, Object>> queryCovidVaccinateAppointment(CovidVaccinateAppointment param) {
-        log.info("查询新冠疫苗预约=>操作人:{},查询条件:{}", TokenUtil.getTokenUserId(),
+        log.info("查询新冠疫苗预约 --> 操作人:{},查询条件:{}", TokenUtil.getTokenUserId(),
                 JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
         IPage<CovidVaccinateAppointment> page = getQueryPage(param);
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
@@ -101,13 +101,13 @@ public class CovidVaccinateAppointmentService {
             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), value);
             } 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), value);
             }
         }
-        //因为在 查看的时候 也是需要 执行
+        //因为在 查看的时候 也是需要 执行 要判断一下 只有日期为空的时候才会插入
         if (dateList.size() > 0) {
             dao.chaRuMeiYouDeDate(code, dateList, value);
         }
@@ -170,7 +170,7 @@ public class CovidVaccinateAppointmentService {
     public ResultVo<Integer> xinZengYiMiao(ZdCovidVaccinate param) {
         try {
             dao.xinZengYiMiao(param);
-            log.info("插入疫苗==》操作人:{},插入信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(param));
+            log.info("插入疫苗 --> 操作人:{},插入信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(param));
         } catch (Exception e) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("<p style='color:red'>【%s】</p>该疫苗名称已存在,添加失败。", param.getName()));
         }
@@ -196,7 +196,7 @@ public class CovidVaccinateAppointmentService {
         //新增厂家
         dao.xinZengChangJia(param);
         for (CovidVaccinateFactory pojo : param) {
-            log.info("插入厂家==》操作人:{},信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(pojo));
+            log.info("插入厂家 --> 操作人:{},信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(pojo));
             //在新插入厂家的时候我就要默认设置好 阈值
             chaRuRiQI(pojo.getCode());
         }
@@ -228,7 +228,7 @@ public class CovidVaccinateAppointmentService {
      * @param param 修改的字段为 name  enableFlag bookTip 通过id来修改
      */
     public ResultVo<Boolean> xiuGaiYiMiao(ZdCovidVaccinate param) {
-        log.info("修改疫苗==》操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
+        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()));
     }
@@ -240,7 +240,7 @@ public class CovidVaccinateAppointmentService {
      * @return 返回boolean
      */
     public ResultVo<Boolean> xiuGaiChangJia(CovidVaccinateFactory param) {
-        log.info("修改新冠疫苗厂家==》操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(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>厂家信息修改成功 φ(゜▽゜*)♪", param.getName()));
     }
@@ -252,7 +252,7 @@ public class CovidVaccinateAppointmentService {
      * @return 返回
      */
     public ResultVo<Boolean> shanChuChangJia(Integer code) {
-        log.info("删除新冠疫苗厂家==》操作人:{},删除的数据:{}", TokenUtil.getTokenUserId(), code);
+        log.info("删除新冠疫苗厂家 --> 操作人:{},删除的数据:{}", TokenUtil.getTokenUserId(), code);
         dao.shanChuChangJia(code);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功 \(☆o☆)/");
     }
@@ -264,7 +264,7 @@ public class CovidVaccinateAppointmentService {
      * @return 通知修改成功
      */
     public ResultVo<Boolean> yiJianXiuGaiRiQi(List<CovidVaccinateThreshold> list) {
-        log.info("修改新冠疫苗厂家阈值==》操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(list));
+        log.info("修改新冠疫苗厂家阈值 --> 操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(list));
         dao.xiuGaiYuZhi(list);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "阈值修改成功 ヽ(”`▽´)ノ");
     }

+ 2 - 2
src/main/java/thyyxxk/webserver/service/querydata/InquiryOfConsultationFeeService.java

@@ -45,7 +45,7 @@ public class InquiryOfConsultationFeeService {
     public ResultVo<Map<String, Object>> inquiryOfConsultationFee(InquiryOfConsultationFee param) {
         IPage<InquiryOfConsultationFee> page = queryPage(param);
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
-        log.info("查询会诊费用==>操作人员:{},开始时间:{},结束时间:{},页码:{},条数{}",
+        log.info("查询会诊费用 --> 操作人员:{},开始时间:{},结束时间:{},页码:{},条数{}",
                 TokenUtil.getTokenUserId(), param.getStartTime(), param.getEndTime(), param.getCurrentPage(), param.getPageSize());
         map.put("total", page.getTotal());
         map.put("data", page.getRecords());
@@ -78,7 +78,7 @@ public class InquiryOfConsultationFeeService {
      *                 以及查询的数据的条件 startTime 开始时间 endTime结束时间
      */
     public void exportExcel(HttpServletResponse response, InquiryOfConsultationFee param) {
-        log.info("导出会诊费用excel: {}", JSON.toJSONString(param));
+        log.info("导出会诊费用excel --> {}", JSON.toJSONString(param));
         List<InquiryOfConsultationFee> list = queryPage(param).getRecords();
         String[] title = {"住院号", "住院次数", "科室", "收费日期", "医生", "会诊级别", "费用"};
         String[][] content = new String[list.size()][];

+ 2 - 2
src/main/java/thyyxxk/webserver/service/querydata/QueryDrugsAndProjectsService.java

@@ -55,7 +55,7 @@ public class QueryDrugsAndProjectsService {
      */
     public ResultVo<List<QueryDrugsAndProjects>> queryProjects(QueryDrugsAndProjects param) {
         List<QueryDrugsAndProjects> list = dao.queryProjects(param);
-        log.info("查询项目收费{},操作人:{},返回的数据:{}", JSON.toJSONString(param), TokenUtil.getTokenUserId(), list.size());
+        log.info("查询项目收费 --> {},操作人:{},返回的数据:{}", JSON.toJSONString(param), TokenUtil.getTokenUserId(), list.size());
         if (list.size() > 0) {
             return ResultVoUtil.success(list);
         }
@@ -69,7 +69,7 @@ public class QueryDrugsAndProjectsService {
      * @return 返回符合的数据
      */
     public ResultVo<List<QueryDrugsAndProjects>> queryDrugs(QueryDrugsAndProjects param) {
-        log.info("查询药品{}", JSON.toJSONString(param));
+        log.info("查询药品 --> {}", JSON.toJSONString(param));
         List<QueryDrugsAndProjects> list = dao.queryDrugs(param);
         if (list.size() > 0) {
             return ResultVoUtil.success(list);

+ 8 - 0
src/main/resources/application.yml

@@ -29,6 +29,11 @@ spring:
           password:
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+        cz:
+          url: "jdbc:postgresql://172.16.32.185:5432/bdp_db"
+          username: "bdp"
+          password: "Powersi$123"
+          driver-class-name: "org.postgresql.Driver"
     hikari:
       minimum-idle: 10
       idle-timeout: 180000
@@ -73,3 +78,6 @@ PROOFREAD:
   http://172.16.30.26:1111/proofread/start
 
 hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1
+logging:
+  level:
+    thyyxxk.webserver.dao: debug