Browse Source

添加备注

xiaochan 4 years ago
parent
commit
806dc00475

+ 0 - 1
src/main/java/thyyxxk/webserver/controller/datamodify/InOrOutOfWarehouseController.java

@@ -39,7 +39,6 @@ public class InOrOutOfWarehouseController {
     public ResultVo<List<GetDropdownBox>> queryCode(@RequestParam("pyCode") String pyCode,
                                                     @RequestParam("flag") Integer flag) {
         return service.queryCode(pyCode, flag);
-
     }
 
     @PostMapping("/xiuGaiRuKuXinXi")

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

@@ -104,7 +104,7 @@ public interface InOrOutOfWarehouseDao {
      *
      * @return 返回全部的科室 code name
      */
-    @Select("select code,rtrim(name)name from zd_unit_code")
+    @Select("select code,rtrim(name)name from zd_unit_code where isnull(del_flag,0)=0")
     List<GetDropdownBox> queryDeptCode();
 
     /**

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

@@ -51,8 +51,6 @@ public class CovidVaccinateAppointmentService {
      * @return 指定数据
      */
     public ResultVo<Map<String, Object>> queryCovidVaccinateAppointment(CovidVaccinateAppointment param) {
-        log.info("查询新冠疫苗预约 --> 操作人:{},查询条件:{}", TokenUtil.getTokenUserId(),
-                JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
         IPage<CovidVaccinateAppointment> page = getQueryPage(param);
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
         if (page.getTotal() > 0 || page.getRecords().size() > 0) {
@@ -69,7 +67,6 @@ public class CovidVaccinateAppointmentService {
      * @return 返回只能预约的厂家信息
      */
     public ResultVo<List<CovidVaccinateFactory>> queryCount() {
-        log.info("查看可以预约疫苗厂家的信息");
         return ResultVoUtil.success(dao.kaiQiYuYueChangJia());
     }
 
@@ -193,7 +190,7 @@ public class CovidVaccinateAppointmentService {
                         param.get(i).getCode(), vaccinesId.get(i), "(๑°3°๑)"));
             }
         }
-        //新增厂家
+        //新增厂家的信息
         dao.xinZengChangJia(param);
         for (CovidVaccinateFactory pojo : param) {
             log.info("插入厂家 --> 操作人:{},信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(pojo));

+ 5 - 5
src/main/resources/application.yml

@@ -29,11 +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"
+    #        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