添加备注和新冠疫苗的阈值设置

pom.xml

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

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: thyyxxk.webserver.WebServerApplication
+

src/main/java/thyyxxk/webserver/dao/his/datamodify/InOrOutOfWarehouseDao.java

@@ -23,12 +23,19 @@ import java.util.List;
 @Mapper
 public interface InOrOutOfWarehouseDao {
 
+    /**
+     * 根据入库单号 或者 入库时间 来查询数据
+     *
+     * @param page  分页对象
+     * @param param currentPage pageSize startTime endTime inDocuNo：入库单号
+     * @return 返回分页的数据
+     */
     @Select("<script>" +
             "select supply_code_name = (select name from yp_zd_supply where code = supply_code), " +
             "manu_code_name = (select name from yp_zd_manufactory where code = manu_code)," +
             "purchaser_name = (select  name from a_employee_mi where code = purchaser)," +
-            "charge_code_name = (select name from yp_zd_dict where isnull(del_flag,0) = 0 " +
-            "and serial = yp_in_detl.serial  and code = charge_code),* " +
+            "charge_code_name = (select name from yp_zd_dict where " +
+            " serial = yp_in_detl.serial  and code = charge_code),* " +
             "from yp_in_detl where 1=1 " +
             "<if test=\"param.startTime!=null and param.startTime!=''\">" +
             "and in_date &gt;= #{param.startTime} and in_date&lt;=#{param.endTime} " +
@@ -40,11 +47,23 @@ public interface InOrOutOfWarehouseDao {
     List<YpInDetl> queryRuKuXinXi(IPage<InOrOutOfWarehousePojo> page, @Param("param") InOrOutOfWarehousePojo param);
 
 
+    /**
+     * 根据不同拼音码 和 不同的表格来查询数据
+     *
+     * @param tableName 要查询的表格名称
+     * @param pyCode    拼音码
+     * @return 返回多个 code 和 name
+     */
     @Select("select code,rtrim(name)name from ${tableName} where py_code like #{pyCode} and isnull(del_flag,0)=0")
     List<GetDropdownBox> queryCode(@Param("tableName") String tableName,
                                    @Param("pyCode") String pyCode);
 
 
+    /**
+     * 更新 入库信息
+     *
+     * @param param 要更新的字段
+     */
     @Update("update yp_in_detl set in_docu_no=#{inDocuNo},supply_code=#{supplyCode},rept_no=#{reptNo}, " +
             "purchaser=#{purchaser},fp_no=#{fpNo},manu_no=#{manuNo},manu_code=#{manuCode}," +
             "license_no=#{licenseNo},in_comment=#{inComment}, " +
@@ -54,6 +73,13 @@ public interface InOrOutOfWarehouseDao {
     void xiuGiRuKuXinXi(YpInDetl param);
 
 
+    /**
+     * 根据入库单号 或者 入库时间 来查询数据
+     *
+     * @param page  分页对象
+     * @param param currentPage pageSize startTime endTime drawNo：出库单号
+     * @return 返回分页的数据
+     */
     @Select("<script>" +
             "select charge_code,out_seri,draw_no,in_draw_no,in_date,group_no,group_no_out,dept_code,out_date,confirm_date," +
             "out_amt,manu_no,  " +
@@ -73,12 +99,27 @@ public interface InOrOutOfWarehouseDao {
     List<YpOutDetl> queryChuKuXinXi(IPage<InOrOutOfWarehousePojo> page, @Param("param") InOrOutOfWarehousePojo param);
 
 
+    /**
+     * 获取到科室的code
+     *
+     * @return 返回全部的科室 code name
+     */
     @Select("select code,rtrim(name)name from zd_unit_code")
     List<GetDropdownBox> queryDeptCode();
 
+    /**
+     * 获取 药房的 code name
+     *
+     * @return 返回code name
+     */
     @Select("select group_no code,rtrim(group_name) name from yp_zd_group_name")
     List<GetDropdownBox> queryGroupNo();
 
+    /**
+     * 更新 出库的信息
+     *
+     * @param param 要更新的字段
+     */
     @Update("update yp_out_detl set draw_no=#{drawNo},out_seri=#{outSeri},in_draw_no=#{inDrawNo},   " +
             "in_date=#{inDate},group_no=#{groupNo}," +
             "out_amt=#{outAmt},manu_no=#{manuNo}," +

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

@@ -38,6 +38,12 @@ public class InOrOutOfWarehouseService {
         this.dao = dao;
     }
 
+    /**
+     * 根据入库单号 或者 入库时间 来查询数据
+     *
+     * @param param currentPage pageSize startTime endTime inDocuNo：入库单号
+     * @return 返回分页的数据
+     */
     public ResultVo<Map<String, Object>> queryRuKuXinXi(InOrOutOfWarehousePojo param) {
         IPage<InOrOutOfWarehousePojo> page = new Page<>(param.getCurrentPage(), param.getPageSize());
         List<YpInDetl> list = dao.queryRuKuXinXi(page, param);
@@ -50,6 +56,13 @@ public class InOrOutOfWarehouseService {
         return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }
 
+    /**
+     * 远程搜索：供应商、采购员、生产厂家
+     *
+     * @param pyCode 拼音编码
+     * @param flag   标识 判断要搜索哪一个 1-供应商 2-采购员 3-生产厂家
+     * @return 返回 code和 name 集合
+     */
     public ResultVo<List<GetDropdownBox>> queryCode(String pyCode, Integer flag) {
         if (flag == 1) {
             //供应商
@@ -65,6 +78,12 @@ public class InOrOutOfWarehouseService {
 
     }
 
+    /**
+     * 修改入库的信息
+     *
+     * @param param 修改的字段
+     * @return 返回通知
+     */
     public ResultVo<String> xiuGiRuKuXinXi(YpInDetl param) {
         dao.xiuGiRuKuXinXi(param);
         log.info("修改入库信息：{},修改人：{}", param, TokenUtil.getTokenUserId());
@@ -72,20 +91,30 @@ public class InOrOutOfWarehouseService {
     }
     /* 出库的信息*/
 
+    /**
+     * 根据入库单号 或者 入库时间 来查询数据
+     *
+     * @param param currentPage pageSize startTime endTime drawNo：出库单号
+     * @return 返回分页的数据
+     */
     public ResultVo<Map<String, Object>> queryChuKuXinXi(InOrOutOfWarehousePojo param) {
-        log.info("查询出库数据：{}", param);
         IPage<InOrOutOfWarehousePojo> page = new Page<>(param.getCurrentPage(), param.getPageSize());
         List<YpOutDetl> list = dao.queryChuKuXinXi(page, param);
-        System.out.println(list);
-        if (list.size() > 0) {
-            Map<String, Object> map = new HashMap<>(Capacity.TWO);
-            map.put("data", list);
-            map.put("total", page.getTotal());
-            return ResultVoUtil.success(map);
+        if (list.size() <= 0) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
-        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        Map<String, Object> map = new HashMap<>(Capacity.TWO);
+        map.put("data", list);
+        map.put("total", page.getTotal());
+        return ResultVoUtil.success(map);
+
     }
 
+    /**
+     * 获取科室和药房的 code name
+     *
+     * @return 返回数组
+     */
     public ResultVo<Map<String, Object>> queryDeptCode() {
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
         map.put("deptCode", dao.queryDeptCode());
@@ -93,6 +122,12 @@ public class InOrOutOfWarehouseService {
         return ResultVoUtil.success(map);
     }
 
+    /**
+     * 修改出库的信息
+     *
+     * @param param 修改字段
+     * @return 返回通知
+     */
     public ResultVo<String> xiuGaiChuKuXinXi(YpOutDetl param) {
         log.info("修改出库信息：{},修改人：{}", param, TokenUtil.getTokenUserId());
         dao.xiuGaiChuKu(param);

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

@@ -82,7 +82,7 @@ public class CovidVaccinateAppointmentService {
      */
     public ResultVo<List<CovidVaccinateThreshold>> queryChangJiaDuiYingDeYuZhi(Integer code) throws ParseException {
         chaRuRiQI(code);
-        return ResultVoUtil.success(dao.chaKanQiTianYuZhi(code, DateUtil.getOffsetDate(1), DateUtil.getOffsetDate(7)));
+        return ResultVoUtil.success(dao.chaKanQiTianYuZhi(code, DateUtil.getOffsetDate(0), DateUtil.getOffsetDate(6)));
     }
 
     /**