Merge branch 'master' of https://gitlab.taihe.com/lighter/web-server

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

@@ -4,7 +4,7 @@ import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.datamodify.GetDropdownBox;
 import thyyxxk.webserver.pojo.datamodify.YzActOrder;
-import thyyxxk.webserver.service.datamodify.YzActOrderService;
+import thyyxxk.webserver.service.datamodify.YzActOrderModifyService;
 
 import java.util.List;
 import java.util.Map;
@@ -19,28 +19,28 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/yzActOrder")
-public class YzActOrderController {
+public class YzActOrderModifyController {
 
-   private final YzActOrderService yz;
+   private final YzActOrderModifyService server;
 
     @Autowired
-   public YzActOrderController (YzActOrderService yz){
-        this.yz = yz;
+   public YzActOrderModifyController(YzActOrderModifyService server){
+        this.server = server;
    }
 
     @GetMapping("/queryYZ")
-    public ResultVo<YzActOrder> queryYZ(@RequestParam("actOrderNo") float actOrderNo){
-        return yz.query(actOrderNo);
+    public ResultVo<YzActOrder> queryYzFee(@RequestParam("actOrderNo") float actOrderNo){
+        return server.query(actOrderNo);
     }
 
     @PostMapping("/update")
     public ResultVo<Boolean> update(@RequestBody YzActOrder data){
-        return yz.update(data);
+        return server.update(data);
     }
 
     @GetMapping("/getDropdownBox")
     public ResultVo<Map<String, List<GetDropdownBox>>> getDropdownBox(){
-        return yz.getDropdownBox();
+        return server.getDropdownBox();
     }
 
 }

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

@@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.*;
 
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.datamodify.ZyDetailCharge;
-import thyyxxk.webserver.service.datamodify.ZyDetailChargeService;
+import thyyxxk.webserver.service.datamodify.ZyChargeFeeModifyService;
 import java.util.Map;
 
 /**
@@ -18,17 +18,17 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/zyDetailCharge")
-public class ZyDetailChargeController {
+public class ZyChargeFeeModifyController {
 
-    private final ZyDetailChargeService zy;
+    private final ZyChargeFeeModifyService zy;
 
-    public ZyDetailChargeController(ZyDetailChargeService zy) {
+    public ZyChargeFeeModifyController(ZyChargeFeeModifyService zy) {
         this.zy = zy;
     }
 
-    @PostMapping("/queryTotal")
-    public ResultVo<Map<String,Object>> queryTotal(@RequestBody ZyDetailCharge data){
-        return zy.queryTotal(data);
+    @PostMapping("/queryHospitalizationExpenses")
+    public ResultVo<Map<String,Object>> queryHospitalizationExpenses(@RequestBody ZyDetailCharge data){
+        return zy.queryHospitalizationExpenses(data);
     }
 
     @PostMapping("/totalModify")

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

@@ -3,13 +3,10 @@ package thyyxxk.webserver.controller.querydata;
 
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
-
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.querydata.TCovidVaccinateAppointment;
 import thyyxxk.webserver.pojo.querydata.TcovidVaccinateThreshold;
-import thyyxxk.webserver.service.querydata.TCovidVaccinateAppointmentService;
-
+import thyyxxk.webserver.service.querydata.CovidVaccinateAppointmentService;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.Date;
@@ -25,21 +22,21 @@ import java.util.Map;
  * @since 2021-03-16
  */
 @RestController
-@RequestMapping("/tCovidVaccinateAppointment")
-public class TCovidVaccinateAppointmentController {
-    private final TCovidVaccinateAppointmentService server;
+@RequestMapping("/CovidVaccinateAppointment")
+public class CovidVaccinateAppointmentController {
+    private final CovidVaccinateAppointmentService server;
 
-
-    public TCovidVaccinateAppointmentController(TCovidVaccinateAppointmentService server) {
+    public CovidVaccinateAppointmentController(CovidVaccinateAppointmentService server) {
         this.server = server;
     }
+
     @PostMapping("/queryXGYM")
-    public ResultVo<Map<String,Object>> queryXGYM(@RequestBody TCovidVaccinateAppointment data){
-        return server.queryXGYM(data);
+    public ResultVo<Map<String,Object>> queryCovidVaccinateAppointment(@RequestBody TCovidVaccinateAppointment data){
+        return server.queryCovidVaccinateAppointment(data);
     }
 
-    @GetMapping("/querycount")
-    public ResultVo<List<TcovidVaccinateThreshold>> querycount() throws ParseException {
+    @GetMapping("/queryCount")
+    public ResultVo<List<TcovidVaccinateThreshold>> queryCount() throws ParseException {
         return server.queryCount();
     }
 

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

@@ -6,27 +6,27 @@ 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.QueryDataServer;
-
-
+import thyyxxk.webserver.service.querydata.InquiryOfConsultationFeeServer;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
+/**
+ * @author 肖蟾
+ */
 @RestController
 @RequestMapping("/queryData")
-public class QueryDataController {
+public class InquiryOfConsultationFeeController {
 
-    private final QueryDataServer server;
+    private final InquiryOfConsultationFeeServer server;
 
     @Autowired
-    public QueryDataController(QueryDataServer server){
+    public InquiryOfConsultationFeeController(InquiryOfConsultationFeeServer server){
         this.server = server;
     }
 
-
     @PostMapping("InquiryOfConsultationFee")
-    public ResultVo<Map<String,Object>> queryTerm(@RequestBody InquiryOfConsultationFee data){
-        return server.queryTerm(data);
+    public ResultVo<Map<String,Object>> inquiryOfConsultationFee(@RequestBody InquiryOfConsultationFee data){
+        return server.inquiryOfConsultationFee(data);
     }
 
     @PostMapping("/ExportConsultationFee")
@@ -34,4 +34,4 @@ public class QueryDataController {
                             @RequestBody @Validated InquiryOfConsultationFee param) {
         server.exportExcel(response,param);
     }
-}
+}

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

@@ -13,7 +13,7 @@ import java.util.ArrayList;
 
 /**
  * <p>
- *  Mapper 接口
+ *  医嘱修改 接口
  * </p>
  *
  * @author 肖蟾
@@ -21,30 +21,50 @@ import java.util.ArrayList;
  */
 @Mapper
 public interface YzActOrderMapper extends BaseMapper<YzActOrder> {
-    @Select("select act_order_no,rtrim((select name from a_employee_mi where code = physician)) physician_name,physician ,exec_unit,\n" +
-            "order_name,drug_specification,rtrim(frequ_code) frequ_code,supply_code,\n" +
-            "start_time,modifier,\n" +
-            "rtrim((select name from a_employee_mi where code = modifier)) modifier_name,modifier,\n" +
-            "end_time,order_time,parent_no,discription,instruction\n" +
-            "from  yz_act_order a\n" +
+
+    /**
+     * 根据医嘱号修改
+     * @param id 医嘱号
+     * @return 返回指定数据
+     * */
+    @Select("select act_order_no,rtrim((select name from a_employee_mi where code = physician)) physician_name,physician ,exec_unit, " +
+            "order_name,drug_specification,rtrim(frequ_code) frequ_code,supply_code, " +
+            "start_time,modifier, " +
+            "rtrim((select name from a_employee_mi where code = modifier)) modifier_name,modifier, " +
+            "end_time,order_time,parent_no,discription,instruction " +
+            "from  yz_act_order a " +
             "where  act_order_no = #{id}")
     YzActOrder query(@Param("id") float id);
 
-    @Update("update yz_act_order set frequ_code=#{frequCode}, supply_code=#{supplyCode},start_time=#{startTime},\n" +
-            "end_time=#{endTime},physician = #{physician},exec_unit=#{execUnit},\n" +
-            "instruction=#{instruction},modifier=#{modifier},order_time=#{orderTime}\n" +
+    /**
+     * 修改医嘱的一些字段
+     * @param yzActOrder 里面传入需要字段和条件
+     * @return 返回
+     * */
+    @Update("update yz_act_order set frequ_code=#{frequCode}, supply_code=#{supplyCode},start_time=#{startTime}, " +
+            "end_time=#{endTime},physician = #{physician},exec_unit=#{execUnit}, " +
+            "instruction=#{instruction},modifier=#{modifier},order_time=#{orderTime} " +
             "where act_order_no = #{actOrderNo}")
-    boolean YzUpdate(YzActOrder yzActOrder);
+    boolean yzUpdate(YzActOrder yzActOrder);
 
-    //获取频次
+    /**
+     * 获取频次
+     * @return 返回
+     * */
     @Select("select rtrim(code) code,rtrim(code) name from yz_order_frequency where isnull(del_flag,0) =0")
-    ArrayList<GetDropdownBox> getFrequCode();
+    ArrayList<GetDropdownBox> getFreQuCode();
 
-    //获取给药方式
+    /**
+     * 获取给药方式
+     * @return 返回
+     * */
     @Select("select code,rtrim(name) name from view_zd_supply_type")
     ArrayList<GetDropdownBox> getSupplyType();
 
-    //获取科室
+    /**
+     * 获取科室
+     * @return 返回
+     * */
     @Select("select code,name from zd_unit_code where isnull(del_flag,0) =0")
     ArrayList<GetDropdownBox> getUnitCode();
 

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

@@ -18,11 +18,24 @@ import thyyxxk.webserver.pojo.datamodify.ZyDetailCharge;
 @Mapper
 public interface ZyDetailChargeMapper   {
 
+
+    /**
+     * 修改单个住院费用的 金额
+     * @param data 需要修改的数据
+     * @return 数据
+     * */
     @Update("update zy_detail_charge set charge_fee = #{newChargeFee} " +
             "where inpatient_no=#{inpatientNo} and detail_sn=#{detailSn} " +
             "and admiss_times=#{admissTimes} and ledger_sn=#{ledgerSn} ")
     boolean totalModify(ZyDetailCharge data);
 
+    /**
+     *根据条件 来查询 住院费用
+     * @param page 分页的条件
+     * @param chargeCodeMx 收费项目码
+     * @param inpatientNo 住院号
+     * @return 数据
+     * */
     @Select("select admiss_times,ledger_sn,detail_sn,charge_date,rtrim(inpatient_no) as inpatient_no," +
             "a.serial,infant_flag,charge_status, " +
             "op_id_code=rtrim((select name from a_employee_mi where code=op_id_code)), " +

src/main/java/thyyxxk/webserver/dao/his/querydata/TCovidVaccinateAppointmentMapper.java → src/main/java/thyyxxk/webserver/dao/his/querydata/CovidVaccinateAppointmentMapper.java

@@ -19,30 +19,54 @@ import java.util.List;
  * @since 2021-03-16
  */
 @Mapper
-public interface TCovidVaccinateAppointmentMapper  {
-
-
-
+public interface CovidVaccinateAppointmentMapper {
 
+    /**
+     * 获取到新冠疫苗预约日期的最大值
+     * @return 返回最大的日期
+     * */
     @Select("select max(date) as date from t_covid_vaccinate_threshold")
     Date maxDate ();
 
+    /**
+     * 查询出指定范围的数据 用来设置 新冠疫苗的预约阈值
+     * @param startDate 开始的日期
+     * @param endDate 世界的日期
+     * @return 返回满足条件的list集合
+     * */
     @Select("select date,value from t_covid_vaccinate_threshold " +
             "where date>= #{startDate} and date <= #{endDate}")
     List<TcovidVaccinateThreshold> queryList(@Param("startDate")String startDate,@Param("endDate")String endDate);
 
+    /**
+     * 查询新冠疫苗的预约阈值如果没有的就会插入一条数据
+     * @param date 要插入的日期
+     * @return 返回插入成功还是失败了
+     * */
     @Insert("insert into t_covid_vaccinate_threshold (date, value) values (#{date},'300')")
     Boolean insertDate(@Param("date") String date);
 
+    /**
+     * 设置新冠疫苗每日预约的人数限制
+     * @param date 设置限制的日期
+     * @param value 设置预约的具体人数
+     * @return
+     * */
     @Update("update t_covid_vaccinate_threshold set value = #{value} where date=#{date}")
     Boolean update(@Param("value")int value, @Param("date")String date);
 
+    /**
+     * 使用了MyBatis-Plus 来查询并分页 新冠疫苗的人数
+     * @param page 分页的条件 current size
+     * @param queryWrapper 这个是mybatis-plus的条件构造器
+     * @return 返回一个分页的对象 包含 符合分页条件的数据 和 符合条件数据条数
+     * */
     @Select("select patient_id,a.name,sex, " +
             "phone,social_no,age,corp_name, " +
             "new_job_category=(b.name),execute_date from t_covid_vaccinate_appointment a " +
             "inner join t_covid_appointment_job_category_dict b on (b.id = job_category) ${ew.customSqlSegment} and " +
             "isnull(del_flag,0)=0")
-    IPage<TCovidVaccinateAppointment> mybatisPlusQueryXGYM (IPage<TCovidVaccinateAppointment> page,
+    IPage<TCovidVaccinateAppointment> mybatisPlusQueryXGYM(IPage<TCovidVaccinateAppointment> page,
                                                            @Param(Constants.WRAPPER) Wrapper<TCovidVaccinateAppointment> queryWrapper);
 
 }

src/main/java/thyyxxk/webserver/dao/his/querydata/QueryDataMapper.java → src/main/java/thyyxxk/webserver/dao/his/querydata/InquiryOfConsultationFeeMapper.java

@@ -6,10 +6,21 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import thyyxxk.webserver.pojo.querydata.InquiryOfConsultationFee;
 
-import java.util.Date;
+
+/**
+ * @author 肖
+ */
 @Mapper
-public interface QueryDataMapper {
+public interface InquiryOfConsultationFeeMapper {
 
+    /**
+     * 查询会诊费用 根据日期区间 进行查询
+     * @param page
+     * page分页的条件
+     * @param endDate 开始时间
+     * @param startDate 结束时间
+     * @return 返回一个 IPage对象里包含了 总条数 以及符合条件的数据
+     * */
     @Select("select a.inpatient_no,a.admiss_times, " +
             "(select name from zd_unit_code where code=a.req_dept1) dept, " +
             "(select name from a_employee_mi where code=a.hz_id) doctor,b.charge_fee, " +
@@ -18,7 +29,7 @@ public interface QueryDataMapper {
             "where input_date>=#{startDate} and input_date<#{endDate} " +
             "and a.act_order_no=b.order_no " +
             "order by a.inpatient_no,a.admiss_times,a.input_date")
-    IPage<InquiryOfConsultationFee> queryTerm(IPage<InquiryOfConsultationFee> page,
-                                              @Param("startDate")String startDate,
-                                              @Param("endDate")String endDate);
+    IPage<InquiryOfConsultationFee> inquiryOfConsultationFee(IPage<InquiryOfConsultationFee> page,
+                                                             @Param("startDate")String startDate,
+                                                             @Param("endDate")String endDate);
 }

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

@@ -7,11 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.rabbitmq.client.impl.AMQImpl;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
+import thyyxxk.webserver.utils.FilterUtil;
 
 /**
  * <p>
@@ -40,8 +42,6 @@ public class TCovidVaccinateAppointment implements Serializable {
     @ApiModelProperty(value = "性别")
     private Integer sex;
 
-    private String newSex;
-
     @ApiModelProperty(value = "联系电话")
     private String phone;
 

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

@@ -12,13 +12,13 @@ import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
-import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- *  服务类
+ *  医嘱修改服务类
  * </p>
  *
  * @author 肖蟾
@@ -26,14 +26,19 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class YzActOrderService  {
+public class YzActOrderModifyService {
     private final YzActOrderMapper dao;
 
     @Autowired
-    public YzActOrderService(YzActOrderMapper dao) {
+    public YzActOrderModifyService(YzActOrderMapper dao) {
         this.dao = dao;
     }
 
+    /**
+     * 根据医嘱号 来查询 符合条件的数据
+     * @param data 医嘱号
+     * @return 返回符合条件的数据
+     * */
     public ResultVo<YzActOrder> query(float data){
         YzActOrder yzActOrder = dao.query(data);
         if (yzActOrder!=null){
@@ -44,8 +49,12 @@ public class YzActOrderService  {
         }
     }
 
+    /**
+     * 修改医嘱字段  医嘱号，频次，给药方式，开始时间，停止时间，医嘱时间，医生，执行科室，医生嘱托，签字医生
+     * @param data 传入需要修改的指定字段
+     * @return 返回
+     * */
     public ResultVo<Boolean> update(YzActOrder data) {
-
         String pattern = "yyyy-MM-dd HH:mm:ss";
         YzActOrder yz = dao.query(data.getActOrderNo());
         log.info("医嘱修改前==>修改人:{}，医嘱号：{}，频次:{}，给药方式:{}，开始时间:{}，停止时间:{}，医嘱时间:{}，医生:{}，执行科室:{}，医生嘱托:{}，签字医生:{}",
@@ -72,16 +81,16 @@ public class YzActOrderService  {
                 data.getExecUnit(),
                 data.getInstruction(),
                 data.getModifier());
-
-        dao.YzUpdate(data);
-        return ResultVoUtil.success();
+        return ResultVoUtil.success(dao.yzUpdate(data));
     }
 
-
+    /**
+     * 获取 频次、给药方式、执行科室的 code 和 name 给到页面中选择
+     * @return 返回map 集合
+     * */
     public ResultVo<Map<String,List<GetDropdownBox>>> getDropdownBox(){
-        Map<String, List<GetDropdownBox>> map = new HashMap<>();
-
-        map.put("frequCode",dao.getFrequCode());
+        Map<String, List<GetDropdownBox>> map = new Hashtable<>();
+        map.put("freQuCode",dao.getFreQuCode());
         map.put("unitCode",dao.getUnitCode());
         map.put("supplyCode",dao.getSupplyType());
         return ResultVoUtil.success(map);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
+import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.dao.his.datamodify.ZyDetailChargeMapper;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.datamodify.ZyDetailCharge;
@@ -12,13 +13,12 @@ import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 
 /**
  * <p>
- *  服务类
+ *  住院费用修改 服务类
  * </p>
  *
  * @author 肖蟾
@@ -26,20 +26,23 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class ZyDetailChargeService  {
+public class ZyChargeFeeModifyService {
 
     private final ZyDetailChargeMapper dao;
 
-    public ZyDetailChargeService(ZyDetailChargeMapper dao) {
+    public ZyChargeFeeModifyService(ZyDetailChargeMapper dao) {
         this.dao = dao;
     }
-
-
-    public ResultVo<Map<String,Object>> queryTotal(ZyDetailCharge data){
+    /**
+     *根据住院号和收费项目码 来查询 住院费用 并且分页查询
+     * @param data 传入 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());
-        Map<String,Object> map = new HashMap<>();
+        Map<String,Object> map = new HashMap<>(Capacity.TWO);
         map.put("data",page.getRecords());
         map.put("total",page.getTotal());
         if (page.getRecords().size()>0 || page.getTotal()>0){
@@ -47,15 +50,16 @@ public class ZyDetailChargeService  {
         }
         return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST,"没有查询到对应的数据，患者可能出院了");
     }
-
-    //修改价格
+    /**
+     * 修改单个住院费用的金额 要根据住院号，流水号，住院次数，结算次数 来获取到单个数据
+     * @param data 需要修改的数据 目前只能修改单个的金额
+     * @return 返回数据
+     * */
     public ResultVo<Boolean> totalModify(ZyDetailCharge data){
-
-        boolean flag = dao.totalModify(data);
-        log.info("修改价格=>操作人员{}，住院号{}，流水号{}，住院次数{}，结算次数{}，修改前{}，修改后{}",
+        log.info("修改价格=>操作人员{}，住院号{}，流水号{}，住院次数{}，结算次数{}，修改前价格{}，修改后价格{}",
                 TokenUtil.getTokenUserId(),data.getInpatientNo(),
                 data.getDetailSn(),data.getAdmissTimes(),data.getLedgerSn(),
                 data.getChargeFee(),data.getNewChargeFee());
-        return ResultVoUtil.success(flag);
+        return ResultVoUtil.success(dao.totalModify(data));
     }
 }

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

@@ -5,23 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.PortableServer.POAPackage.InvalidPolicy;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.dao.his.querydata.TCovidVaccinateAppointmentMapper;
+import thyyxxk.webserver.constants.Capacity;
+import thyyxxk.webserver.dao.his.querydata.CovidVaccinateAppointmentMapper;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.querydata.TCovidVaccinateAppointment;
 import thyyxxk.webserver.pojo.querydata.TcovidVaccinateThreshold;
-import thyyxxk.webserver.pojo.wxapi.QueryWxOrderParam;
 import thyyxxk.webserver.utils.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -33,20 +29,25 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class TCovidVaccinateAppointmentService  {
-    private final TCovidVaccinateAppointmentMapper dao;
+public class CovidVaccinateAppointmentService {
+    private final CovidVaccinateAppointmentMapper dao;
 
-    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd");
 
-    public TCovidVaccinateAppointmentService(TCovidVaccinateAppointmentMapper dao) {
+    public CovidVaccinateAppointmentService(CovidVaccinateAppointmentMapper dao) {
         this.dao = dao;
     }
 
-    public ResultVo<Map<String,Object>> queryXGYM(TCovidVaccinateAppointment data){
+    /**
+     * 通过日期区间或者预约的姓名 来查找到数据 分页查询
+     * @param data name姓名  ExecuteDate预约时间  currentPage PageSize
+     * @return 指定数据
+     * */
+    public ResultVo<Map<String,Object>> queryCovidVaccinateAppointment(TCovidVaccinateAppointment data){
         log.info("查询新冠疫苗预约=>操作人：{}，查找姓名：{}，查找日期：{}", TokenUtil.getTokenUserId(),
                 data.getName(),data.getExecuteDate()!=null? DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"): "");
         IPage<TCovidVaccinateAppointment> page = getQueryPage(data);
-        Map map = new HashMap();
+        Map<String, Object> map = new HashMap<>(Capacity.TWO);
         if (page.getTotal()>0 || page.getRecords().size()>0){
             map.put("total",page.getTotal());
             map.put("data",page.getRecords());
@@ -55,9 +56,14 @@ public class TCovidVaccinateAppointmentService  {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }
 
+    /**
+     * 查询近七日的预约人数 如果没有指定的日期就插入一条
+     * @return 指定数据
+     * */
+    static final int GET_DATE_SECTION = 7;
     public ResultVo<List<TcovidVaccinateThreshold>> queryCount() throws ParseException {
-        for(int i =1;i<=7;i++){
-            Date date =sdf.parse(DateUtil.getOffsetDate(i));
+        for(int i = 1; i<= GET_DATE_SECTION; i++){
+            Date date =SDF.parse(DateUtil.getOffsetDate(i));
             if (dao.maxDate().getTime()<date.getTime()){
                 dao.insertDate(DateUtil.getOffsetDate(i));
                 log.info("日期为：{}的没有插入",DateUtil.getOffsetDate(i));
@@ -67,16 +73,26 @@ public class TCovidVaccinateAppointmentService  {
 
     }
 
+    /**
+     * 修改指定日期的人数
+     * @param modificationDate 原本阈值人数
+     * @param newRevisionDate  设置阈值人数
+     * @param date 阈值日期
+     * @return 返回符合的数据
+     * */
     public ResultVo<Boolean> update(int modificationDate, Date date, int newRevisionDate){
-        String oldDate = sdf.format(date);
         log.info("修改疫苗预约人数=>操作员：{}，修改的日期为：{}，限制人数为：{}，原本的人数为：{}",
-                TokenUtil.getTokenUserId(),oldDate,newRevisionDate,modificationDate);
-         return ResultVoUtil.success(dao.update(newRevisionDate,oldDate));
+                TokenUtil.getTokenUserId(),SDF.format(date),newRevisionDate,modificationDate);
+         return ResultVoUtil.success(dao.update(newRevisionDate,SDF.format(date)));
     }
 
+    /**
+     * 查询指定的数据然后导出
+     * @param response 返回数据
+     * @param param  name姓名  ExecuteDate预约时间  currentPage=1  PageSize=-1 这样写才能导出全部的数据
+     * */
     public void exportExcel(HttpServletResponse response, TCovidVaccinateAppointment param) {
         log.info("导出新冠疫苗excel: {}", JSON.toJSONString(param));
-
         IPage<TCovidVaccinateAppointment> page =  getQueryPage(param);
         List<TCovidVaccinateAppointment> list = page.getRecords();
         String[] title = {"门诊id","姓名","性别","联系电话","身份证号","年龄","工作单位","工作性质","预约接种时间"};
@@ -86,7 +102,7 @@ public class TCovidVaccinateAppointmentService  {
             TCovidVaccinateAppointment tc = list.get(i);
             content[i][0] = tc.getPatientId();
             content[i][1] = tc.getName();
-            content[i][2] = tc.getNewSex();
+            content[i][2] = tc.getSex()==1?"男":"女";
             content[i][3] = tc.getPhone();
             content[i][4] = tc.getSocialNo();
             content[i][5] = String.valueOf(tc.getAge());
@@ -98,12 +114,15 @@ public class TCovidVaccinateAppointmentService  {
         ExcelUtil.exportExcel(response, title, content);
     }
 
+    /**
+     *根据查询 名字或者预约时间 分页显示在页面中
+     * @param param 查询和分页的条件
+     * @return 返回分页
+     * */
     public IPage<TCovidVaccinateAppointment> getQueryPage(TCovidVaccinateAppointment param){
         IPage<TCovidVaccinateAppointment> page = new Page<>(param.getCurrentPage(),param.getPageSize());
-
         QueryWrapper<TCovidVaccinateAppointment> qw = new QueryWrapper<>();
-        Map map = new HashMap();
-        if (param.getName() != null && param.getName() !="" && !param.getName().equals("")){
+        if (param.getName() != null  && !"".equals(param.getName())){
             qw.eq("a.name",param.getName());
         }
         if (param.getExecuteDate() != null  ){

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

@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.dao.his.querydata.QueryDataMapper;
+import thyyxxk.webserver.constants.Capacity;
+import thyyxxk.webserver.dao.his.querydata.InquiryOfConsultationFeeMapper;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.querydata.InquiryOfConsultationFee;
-import thyyxxk.webserver.pojo.querydata.TCovidVaccinateAppointment;
 import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ExcelUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
@@ -21,18 +21,29 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author 肖
+ */
 @Service
 @Slf4j
-public class QueryDataServer {
-    private final QueryDataMapper dao;
+public class InquiryOfConsultationFeeServer {
+    private final InquiryOfConsultationFeeMapper dao;
 
-    public QueryDataServer(QueryDataMapper dao) {
+    public InquiryOfConsultationFeeServer(InquiryOfConsultationFeeMapper dao) {
         this.dao = dao;
     }
 
-    public ResultVo<Map<String,Object>> queryTerm(InquiryOfConsultationFee data){
+    /**
+    *  查询会诊的费用
+    *  根据的日期区间查询 并分页查询
+    * @param data 查询条件
+    * data中包含 分页条件 current 页数 size 条数
+    * 以及查询的数据的条件 startTime 开始时间 endTime结束时间
+    * @return 返回一个map的集合 包含的分页的数据以及总的条数
+    * */
+    public ResultVo<Map<String,Object>> inquiryOfConsultationFee(InquiryOfConsultationFee data){
         IPage<InquiryOfConsultationFee> page = queryPage(data);
-        Map<String,Object> map = new HashMap<>();
+        Map<String,Object> map = new HashMap<>(Capacity.TWO);
         log.info("查询会诊费用==>操作人员：{}，开始时间：{}，结束时间：{}",
                 TokenUtil.getTokenUserId(),data.getStartTime(),data.getEndTime());
         map.put("total",page.getTotal());
@@ -43,29 +54,42 @@ public class QueryDataServer {
         return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }
 
+    /**
+     * 查询会诊的费用
+     *  根据的日期区间查询
+     * @param data 查询条件
+     * data中包含 分页条件 current 页数 size 条数
+     * 以及查询的数据的条件 startTime 开始时间 endTime结束时间
+     * @return 返回一个 IPage 对象
+     * */
     public IPage<InquiryOfConsultationFee> queryPage(InquiryOfConsultationFee data){
         IPage<InquiryOfConsultationFee> page = new Page<>(data.getCurrent(),data.getSize());
-        return dao.queryTerm(page,data.getStartTime(),data.getEndTime());
+        return dao.inquiryOfConsultationFee(page,data.getStartTime(),data.getEndTime());
     }
 
+    /**
+     * 把查询到的数据 生成excel表格 并返回给前端
+     * @param response 向客户端返回数据的
+     * @param param 查询条件
+     * data中包含 分页条件 current 页数 size 条数
+     * 以及查询的数据的条件 startTime 开始时间 endTime结束时间
+     * */
     public void exportExcel(HttpServletResponse response,InquiryOfConsultationFee param){
         log.info("导出会诊费用excel: {}", JSON.toJSONString(param));
-        System.out.println();
         IPage<InquiryOfConsultationFee> page =  queryPage(param);
         List<InquiryOfConsultationFee> list = page.getRecords();
-        String[] title = {"住院号","住院次数","科室","收费日期","医生","职位","费用"};
+        String[] title = {"住院号","住院次数","科室","收费日期","医生","会诊级别","费用"};
         String[][] content = new String[list.size()][];
         for (int i = 0; i < list.size(); i++){
             content[i] = new String[title.length];
-            InquiryOfConsultationFee iof = list.get(i);
-            content[i][0] = iof.getInpatientNo();
-            content[i][1] = String.valueOf(iof.getAdmissTimes());
-            content[i][2] = iof.getDept();
-            content[i][3] = DateUtil.formatDatetime(iof.getInputDate());
-            content[i][4] = iof.getDoctor();
-            content[i][5] = iof.getPosition();
-            content[i][6] =iof.getChargeFee();
-
+            InquiryOfConsultationFee pojo = list.get(i);
+            content[i][0] = pojo.getInpatientNo();
+            content[i][1] = String.valueOf(pojo.getAdmissTimes());
+            content[i][2] = pojo.getDept();
+            content[i][3] = DateUtil.formatDatetime(pojo.getInputDate());
+            content[i][4] = pojo.getDoctor();
+            content[i][5] = pojo.getPosition();
+            content[i][6] = pojo.getChargeFee()+" ￥";
         }
         //传三个参数 一个是 固定的 response ，excel的头部信息，excel的内容
         ExcelUtil.exportExcel(response, title, content);

src/test/java/thyyxxk/webserver/WebServerApplicationTests.java

@@ -4,7 +4,7 @@ package thyyxxk.webserver;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import thyyxxk.webserver.service.datamodify.ZyDetailChargeService;
+import thyyxxk.webserver.service.datamodify.ZyChargeFeeModifyService;
 
 
 
@@ -12,7 +12,7 @@ import thyyxxk.webserver.service.datamodify.ZyDetailChargeService;
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class WebServerApplicationTests {
     @Autowired
-    private ZyDetailChargeService zy;
+    private ZyChargeFeeModifyService zy;
 
 
     @Test