修改命名。

src/main/java/thyyxxk/webserver/controller/datamodify/YzActOrderModifyController.java

@@ -31,8 +31,8 @@ public class YzActOrderModifyController {
     }
 
     @PostMapping("/update")
-    public ResultVo<Boolean> update(@RequestBody YzActOrder data){
-        return server.update(data);
+    public ResultVo<Boolean> update(@RequestBody YzActOrder param){
+        return server.update(param);
     }
 
     @GetMapping("/getDropdownBox")

src/main/java/thyyxxk/webserver/controller/datamodify/ZyChargeFeeModifyController.java

@@ -27,13 +27,13 @@ public class ZyChargeFeeModifyController {
     }
 
     @PostMapping("/queryHospitalizationExpenses")
-    public ResultVo<Map<String,Object>> queryHospitalizationExpenses(@RequestBody ZyDetailCharge data){
-        return zy.queryHospitalizationExpenses(data);
+    public ResultVo<Map<String,Object>> queryHospitalizationExpenses(@RequestBody ZyDetailCharge param){
+        return zy.queryHospitalizationExpenses(param);
     }
 
     @PostMapping("/totalModify")
-    public ResultVo<Boolean> totalModify(@RequestBody ZyDetailCharge data){
-        return zy.totalModify(data);
+    public ResultVo<Boolean> totalModify(@RequestBody ZyDetailCharge param){
+        return zy.totalModify(param);
     }
 }
 

src/main/java/thyyxxk/webserver/controller/querydata/CovidVaccinateAppointmentController.java

@@ -31,8 +31,8 @@ public class CovidVaccinateAppointmentController {
     }
 
     @PostMapping("/queryXGYM")
-    public ResultVo<Map<String,Object>> queryCovidVaccinateAppointment(@RequestBody CovidVaccinateAppointment data){
-        return server.queryCovidVaccinateAppointment(data);
+    public ResultVo<Map<String,Object>> queryCovidVaccinateAppointment(@RequestBody CovidVaccinateAppointment param){
+        return server.queryCovidVaccinateAppointment(param);
     }
 
     @GetMapping("/queryCount")
@@ -42,9 +42,9 @@ public class CovidVaccinateAppointmentController {
 
     @GetMapping("/update")
     public ResultVo<Boolean> update(@RequestParam("value")int value,
-                                    @RequestParam("date") Date date,
+                                    @RequestParam("date") Date limitDate,
                                     @RequestParam("newValue") int newValue){
-        return server.update(value,date,newValue);
+        return server.update(value,limitDate,newValue);
     }
     @PostMapping("/exportExcel")
     public void exportExcel(HttpServletResponse response,

src/main/java/thyyxxk/webserver/controller/querydata/InquiryOfConsultationFeeController.java

@@ -6,7 +6,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.querydata.InquiryOfConsultationFee;
-import thyyxxk.webserver.service.querydata.InquiryOfConsultationFeeServer;
+import thyyxxk.webserver.service.querydata.InquiryOfConsultationFeeService;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
@@ -18,16 +18,16 @@ import java.util.Map;
 @RequestMapping("/queryData")
 public class InquiryOfConsultationFeeController {
 
-    private final InquiryOfConsultationFeeServer server;
+    private final InquiryOfConsultationFeeService server;
 
     @Autowired
-    public InquiryOfConsultationFeeController(InquiryOfConsultationFeeServer server){
+    public InquiryOfConsultationFeeController(InquiryOfConsultationFeeService server){
         this.server = server;
     }
 
     @PostMapping("InquiryOfConsultationFee")
-    public ResultVo<Map<String,Object>> inquiryOfConsultationFee(@RequestBody InquiryOfConsultationFee data){
-        return server.inquiryOfConsultationFee(data);
+    public ResultVo<Map<String,Object>> inquiryOfConsultationFee(@RequestBody InquiryOfConsultationFee param){
+        return server.inquiryOfConsultationFee(param);
     }
 
     @PostMapping("/ExportConsultationFee")

src/main/java/thyyxxk/webserver/pojo/querydata/CovidVaccinateThreshold.java

@@ -2,7 +2,6 @@ package thyyxxk.webserver.pojo.querydata;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -15,6 +14,7 @@ import java.util.Date;
 @Data
 public class CovidVaccinateThreshold {
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
     private Integer value;

src/main/java/thyyxxk/webserver/pojo/querydata/InquiryOfConsultationFee.java

@@ -18,8 +18,8 @@ public class InquiryOfConsultationFee {
     private String position;
     private Date inputDate;
 
-    private Integer current;
-    private Integer size;
+    private Integer currentPage;
+    private Integer pageSize;
 
     private String startTime;
     private String endTime;

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

@@ -4,6 +4,7 @@ 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;
 import thyyxxk.webserver.dao.his.datamodify.YzActOrderMapper;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.datamodify.GetDropdownBox;
@@ -12,7 +13,7 @@ import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,13 +37,13 @@ public class YzActOrderModifyService {
 
     /**
      * 根据医嘱号 来查询 符合条件的数据
-     * @param data 医嘱号
+     * @param inpatientNo 医嘱号
      * @return 返回符合条件的数据
      * */
-    public ResultVo<YzActOrder> query(float data){
-        YzActOrder yzActOrder = dao.query(data);
+    public ResultVo<YzActOrder> query(float inpatientNo){
+        YzActOrder yzActOrder = dao.query(inpatientNo);
         if (yzActOrder!=null){
-            log.info("查询医嘱号=>{}",data);
+            log.info("查询医嘱号=>{}",inpatientNo);
             return ResultVoUtil.success(yzActOrder);
         }else {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
@@ -51,37 +52,37 @@ public class YzActOrderModifyService {
 
     /**
      * 修改医嘱字段  医嘱号，频次，给药方式，开始时间，停止时间，医嘱时间，医生，执行科室，医生嘱托，签字医生
-     * @param data 传入需要修改的指定字段
+     * @param param 传入需要修改的指定字段
      * @return 返回
      * */
-    public ResultVo<Boolean> update(YzActOrder data) {
-        String pattern = "yyyy-MM-dd HH:mm:ss";
-        YzActOrder yz = dao.query(data.getActOrderNo());
+    static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public ResultVo<Boolean> update(YzActOrder param) {
+        YzActOrder yz = dao.query(param.getActOrderNo());
         log.info("医嘱修改前==>修改人:{}，医嘱号：{}，频次:{}，给药方式:{}，开始时间:{}，停止时间:{}，医嘱时间:{}，医生:{}，执行科室:{}，医生嘱托:{}，签字医生:{}",
                 TokenUtil.getTokenUserId(),
                 yz.getActOrderNo(),
                 yz.getFrequCode(),
                 yz.getSupplyCode(),
-                yz.getStartTime()!=null? DateUtil.formatDatetime(yz.getStartTime(),pattern):"null",
-                yz.getEndTime()!=null? DateUtil.formatDatetime(yz.getEndTime(),pattern): "null",
-                yz.getOrderTime()!=null? DateUtil.formatDatetime(yz.getOrderTime(),pattern): "null",
+                yz.getStartTime()!=null? DateUtil.formatDatetime(yz.getStartTime(),PATTERN):"null",
+                yz.getEndTime()!=null? DateUtil.formatDatetime(yz.getEndTime(),PATTERN): "null",
+                yz.getOrderTime()!=null? DateUtil.formatDatetime(yz.getOrderTime(),PATTERN): "null",
                 yz.getPhysician(),
                 yz.getExecUnit(),
                 yz.getInstruction(),
                 yz.getModifier());
         log.info("医嘱修改后==>修改人:{}，医嘱号：{}，频次:{}，给药方式:{}，开始时间:{}，停止时间:{}，医嘱时间:{}，医生:{}，执行科室:{}，医生嘱托:{}，签字医生:{}",
                 TokenUtil.getTokenUserId(),
-                data.getActOrderNo(),
-                data.getFrequCode(),
-                data.getSupplyCode(),
-                data.getStartTime()!=null? DateUtil.formatDatetime(data.getStartTime(),pattern):"null",
-                data.getEndTime()!=null ?  DateUtil.formatDatetime(data.getEndTime(),pattern): "null",
-                data.getOrderTime()!=null? DateUtil.formatDatetime(data.getOrderTime(),pattern):"null",
-                data.getPhysician(),
-                data.getExecUnit(),
-                data.getInstruction(),
-                data.getModifier());
-        return ResultVoUtil.success(dao.yzUpdate(data));
+                param.getActOrderNo(),
+                param.getFrequCode(),
+                param.getSupplyCode(),
+                param.getStartTime()!=null? DateUtil.formatDatetime(param.getStartTime(),PATTERN):"null",
+                param.getEndTime()!=null ?  DateUtil.formatDatetime(param.getEndTime(),PATTERN): "null",
+                param.getOrderTime()!=null? DateUtil.formatDatetime(param.getOrderTime(),PATTERN):"null",
+                param.getPhysician(),
+                param.getExecUnit(),
+                param.getInstruction(),
+                param.getModifier());
+        return ResultVoUtil.success(dao.yzUpdate(param));
     }
 
     /**
@@ -89,7 +90,7 @@ public class YzActOrderModifyService {
      * @return 返回map 集合
      * */
     public ResultVo<Map<String,List<GetDropdownBox>>> getDropdownBox(){
-        Map<String, List<GetDropdownBox>> map = new Hashtable<>();
+        Map<String, List<GetDropdownBox>> map = new HashMap<>(Capacity.TWO);
         map.put("freQuCode",dao.getFreQuCode());
         map.put("unitCode",dao.getUnitCode());
         map.put("supplyCode",dao.getSupplyType());

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

@@ -35,13 +35,13 @@ public class ZyChargeFeeModifyService {
     }
     /**
      *根据住院号和收费项目码 来查询 住院费用 并且分页查询
-     * @param data 传入 inpatient_no 住院号 charge_code_mx 收费项目码  分页条件 currentPage  PageSize
+     * @param param 传入 inpatient_no 住院号 charge_code_mx 收费项目码  分页条件 currentPage  PageSize
      * @return 返回数据
      * */
-    public ResultVo<Map<String,Object>> queryHospitalizationExpenses(ZyDetailCharge data){
-        IPage<ZyDetailCharge> page = new Page<>(data.getCurrentPage(),data.getPageSize());
-        dao.queryHospitalizationExpenses(page,data.getInpatientNo(),data.getChargeCodeMx());
-        log.info("查看总价格=>住院号{},收费项目码{}",data.getInpatientNo(),data.getChargeCodeMx());
+    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());
         Map<String,Object> map = new HashMap<>(Capacity.TWO);
         map.put("data",page.getRecords());
         map.put("total",page.getTotal());
@@ -52,14 +52,14 @@ public class ZyChargeFeeModifyService {
     }
     /**
      * 修改单个住院费用的金额 要根据住院号，流水号，住院次数，结算次数 来获取到单个数据
-     * @param data 需要修改的数据 目前只能修改单个的金额
+     * @param param 需要修改的数据 目前只能修改单个的金额
      * @return 返回数据
      * */
-    public ResultVo<Boolean> totalModify(ZyDetailCharge data){
+    public ResultVo<Boolean> totalModify(ZyDetailCharge param){
         log.info("修改价格=>操作人员{}，住院号{}，流水号{}，住院次数{}，结算次数{}，修改前价格{}，修改后价格{}",
-                TokenUtil.getTokenUserId(),data.getInpatientNo(),
-                data.getDetailSn(),data.getAdmissTimes(),data.getLedgerSn(),
-                data.getChargeFee(),data.getNewChargeFee());
-        return ResultVoUtil.success(dao.totalModify(data));
+                TokenUtil.getTokenUserId(),param.getInpatientNo(),
+                param.getDetailSn(),param.getAdmissTimes(),param.getLedgerSn(),
+                param.getChargeFee(),param.getNewChargeFee());
+        return ResultVoUtil.success(dao.totalModify(param));
     }
 }

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

@@ -40,14 +40,14 @@ public class CovidVaccinateAppointmentService {
 
     /**
      * 通过日期区间或者预约的姓名 来查找到数据 分页查询
-     * @param data 包含 name姓名  ExecuteDate预约时间  currentPage PageSize
+     * @param param 包含 name姓名  ExecuteDate预约时间  currentPage PageSize
      * @return 指定数据
      * */
-    public ResultVo<Map<String,Object>> queryCovidVaccinateAppointment(CovidVaccinateAppointment data){
+    public ResultVo<Map<String,Object>> queryCovidVaccinateAppointment(CovidVaccinateAppointment param){
         log.info("查询新冠疫苗预约=>操作人：{}，查找姓名：{}，查找日期：{}，页码：{}，条数{}", TokenUtil.getTokenUserId(),
-                data.getName(),data.getExecuteDate()!=null? DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"): "",
-                data.getCurrentPage(),data.getPageSize());
-        IPage<CovidVaccinateAppointment> page = getQueryPage(data);
+                param.getName(),param.getExecuteDate()!=null? DateUtil.formatDatetime(param.getExecuteDate(),"yyyy-MM-dd"): "",
+                param.getCurrentPage(),param.getPageSize());
+        IPage<CovidVaccinateAppointment> page = getQueryPage(param);
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
         if (page.getTotal()>0 || page.getRecords().size()>0){
             map.put("total",page.getTotal());
@@ -71,20 +71,19 @@ public class CovidVaccinateAppointmentService {
             }
         }
         return ResultVoUtil.success(dao.queryList(DateUtil.getOffsetDate(1),DateUtil.getOffsetDate(7)));
-
     }
 
     /**
      * 修改指定日期的人数
      * @param modificationDate 原本阈值人数
      * @param newRevisionDate  设置阈值人数
-     * @param date 阈值日期
+     * @param limitDate 阈值日期
      * @return 返回符合的数据
      * */
-    public ResultVo<Boolean> update(int modificationDate, Date date, int newRevisionDate){
+    public ResultVo<Boolean> update(int modificationDate, Date limitDate, int newRevisionDate){
         log.info("修改疫苗预约人数=>操作员：{}，修改的日期为：{}，限制人数为：{}，原本的人数为：{}",
-                TokenUtil.getTokenUserId(),SDF.format(date),newRevisionDate,modificationDate);
-         return ResultVoUtil.success(dao.update(newRevisionDate,SDF.format(date)));
+                TokenUtil.getTokenUserId(),SDF.format(limitDate),newRevisionDate,modificationDate);
+         return ResultVoUtil.success(dao.update(newRevisionDate,SDF.format(limitDate)));
     }
 
     /**
@@ -131,4 +130,4 @@ public class CovidVaccinateAppointmentService {
         }
         return dao.mybatisPlusQueryXGYM(page,qw);
     }
-}
+}

src/main/java/thyyxxk/webserver/service/querydata/InquiryOfConsultationFeeServer.java → src/main/java/thyyxxk/webserver/service/querydata/InquiryOfConsultationFeeService.java

@@ -27,26 +27,26 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class InquiryOfConsultationFeeServer {
+public class InquiryOfConsultationFeeService {
     private final InquiryOfConsultationFeeMapper dao;
 
-    public InquiryOfConsultationFeeServer(InquiryOfConsultationFeeMapper dao) {
+    public InquiryOfConsultationFeeService(InquiryOfConsultationFeeMapper dao) {
         this.dao = dao;
     }
 
     /**
     *  查询会诊的费用
     *  根据的日期区间查询 并分页查询
-    * @param data 查询条件
+    * @param param 查询条件
     * data中包含 分页条件 current 页数 size 条数
     * 以及查询的数据的条件 startTime 开始时间 endTime结束时间
     * @return 返回一个map的集合 包含的分页的数据以及总的条数
     * */
-    public ResultVo<Map<String,Object>> inquiryOfConsultationFee(InquiryOfConsultationFee data){
-        IPage<InquiryOfConsultationFee> page = queryPage(data);
+    public ResultVo<Map<String,Object>> inquiryOfConsultationFee(InquiryOfConsultationFee param){
+        IPage<InquiryOfConsultationFee> page = queryPage(param);
         Map<String,Object> map = new HashMap<>(Capacity.TWO);
         log.info("查询会诊费用==>操作人员：{}，开始时间：{}，结束时间：{},页码：{}，条数{}",
-                TokenUtil.getTokenUserId(),data.getStartTime(),data.getEndTime(),data.getCurrent(),data.getSize());
+                TokenUtil.getTokenUserId(),param.getStartTime(),param.getEndTime(),param.getCurrentPage(),param.getPageSize());
         map.put("total",page.getTotal());
         map.put("data",page.getRecords());
         if (page.getTotal()>0 || page.getRecords().size()>0){
@@ -58,14 +58,14 @@ public class InquiryOfConsultationFeeServer {
     /**
      * 查询会诊的费用
      *  根据的日期区间查询
-     * @param data 查询条件
+     * @param param 查询条件
      * data中包含 分页条件 current 页数 size 条数
      * 以及查询的数据的条件 startTime 开始时间 endTime结束时间
-     * @return 返回一个 IPage 对象
+     * @return 返回一个 IPage 对象里面
      * */
-    public IPage<InquiryOfConsultationFee> queryPage(InquiryOfConsultationFee data){
-        IPage<InquiryOfConsultationFee> page = new Page<>(data.getCurrent(),data.getSize());
-        return dao.inquiryOfConsultationFee(page,data.getStartTime(),data.getEndTime());
+    public IPage<InquiryOfConsultationFee> queryPage(InquiryOfConsultationFee param){
+        IPage<InquiryOfConsultationFee> page = new Page<>(param.getCurrentPage(),param.getPageSize());
+        return dao.inquiryOfConsultationFee(page,param.getStartTime(),param.getEndTime());
     }
 
     /**