阿里注释规范

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

@@ -26,7 +26,7 @@ public class InquiryOfConsultationFeeController {
 
     @PostMapping("InquiryOfConsultationFee")
     public ResultVo<Map<String,Object>> inquiryOfConsultationFee(@RequestBody InquiryOfConsultationFee data){
-        return server.InquiryOfConsultationFee(data);
+        return server.inquiryOfConsultationFee(data);
     }
 
     @PostMapping("/ExportConsultationFee")

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,46 @@ 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 里面传入需要字段和条件
+     * */
+    @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);
 
-    //获取频次
+    /**
+     * 获取频次
+     * */
     @Select("select rtrim(code) code,rtrim(code) name from yz_order_frequency where isnull(del_flag,0) =0")
     ArrayList<GetDropdownBox> getFrequCode();
 
-    //获取给药方式
+    /**
+     * 获取给药方式
+     * */
     @Select("select code,rtrim(name) name from view_zd_supply_type")
     ArrayList<GetDropdownBox> getSupplyType();
 
-    //获取科室
+    /**
+     * 获取科室
+     * */
     @Select("select code,name from zd_unit_code where isnull(del_flag,0) =0")
     ArrayList<GetDropdownBox> getUnitCode();
 

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

@@ -19,7 +19,7 @@ import java.util.List;
  * @since 2021-03-16
  */
 @Mapper
-public interface TCovidVaccinateAppointmentMapper  {
+public interface CovidVaccinateAppointmentMapper {
 
     /**
      * 获取到新冠疫苗预约日期的最大值

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/YzActOrderModifyService.java

@@ -12,7 +12,6 @@ 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;
@@ -52,7 +51,7 @@ public class YzActOrderModifyService {
 
     /**
      * 修改医嘱字段  医嘱号，频次，给药方式，开始时间，停止时间，医嘱时间，医生，执行科室，医生嘱托，签字医生
-     * @param data 传入需要修改的 字段
+     * @param data 传入需要修改的指定字段
      * @return
      * */
     public ResultVo<Boolean> update(YzActOrder data) {

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

@@ -35,7 +35,8 @@ public class ZyChargeFeeModifyService {
         this.dao = dao;
     }
     /**
-     *根据住院号和收费项目码 来查询 住院费用 并且分页查询 current size
+     *根据住院号和收费项目码 来查询 住院费用 并且分页查询
+     * @param data 传入 inpatient_no 住院号 charge_code_mx 收费项目码  分页条件 currentPage  PageSize
      * @return
      * */
     public ResultVo<Map<String,Object>> queryHospitalizationExpenses(ZyDetailCharge data){
@@ -51,8 +52,8 @@ public class ZyChargeFeeModifyService {
         return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST,"没有查询到对应的数据，患者可能出院了");
     }
     /**
-     * 修改单个住院费用的 金额 要根据 住院号，流水号，住院次数，结算次数 来获取到单个数据
-     * @param data 需要修改的数据
+     * 修改单个住院费用的金额 要根据住院号，流水号，住院次数，结算次数 来获取到单个数据
+     * @param data 需要修改的数据 目前只能修改单个的金额
      * @return
      * */
     public ResultVo<Boolean> totalModify(ZyDetailCharge data){

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

@@ -4,17 +4,14 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.corba.se.spi.ior.ObjectKey;
 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.constants.Capacity;
-import thyyxxk.webserver.dao.his.querydata.TCovidVaccinateAppointmentMapper;
+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;
@@ -33,14 +30,20 @@ import java.util.*;
 @Slf4j
 @Service
 public class CovidVaccinateAppointmentService {
-    private final TCovidVaccinateAppointmentMapper dao;
+    private final CovidVaccinateAppointmentMapper dao;
+    private final Integer GET_DATE_SECTION = 7;
 
     private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd");
 
-    public CovidVaccinateAppointmentService(TCovidVaccinateAppointmentMapper dao) {
+    public CovidVaccinateAppointmentService(CovidVaccinateAppointmentMapper dao) {
         this.dao = dao;
     }
 
+    /**
+     * 通过日期区间或者预约的姓名 来查找到数据 分页查询
+     * @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"): "");
@@ -54,8 +57,12 @@ public class CovidVaccinateAppointmentService {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }
 
+    /**
+     * 查询近七日的预约人数 如果没有指定的日期就插入一条
+     * @return
+     * */
     public ResultVo<List<TcovidVaccinateThreshold>> queryCount() throws ParseException {
-        for(int i =1;i<=7;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));
@@ -66,6 +73,13 @@ public class CovidVaccinateAppointmentService {
 
     }
 
+    /**
+     * 修改指定日期的人数
+     * @param modificationDate 原本阈值人数
+     * @param newRevisionDate  设置阈值人数
+     * @param date 阈值日期
+     * @return
+     * */
     public ResultVo<Boolean> update(int modificationDate, Date date, int newRevisionDate){
         String oldDate = SDF.format(date);
         log.info("修改疫苗预约人数=>操作员：{}，修改的日期为：{}，限制人数为：{}，原本的人数为：{}",
@@ -73,6 +87,12 @@ public class CovidVaccinateAppointmentService {
          return ResultVoUtil.success(dao.update(newRevisionDate,oldDate));
     }
 
+    /**
+     * 查询指定的数据然后导出
+     * @param response
+     * @param param  name姓名  ExecuteDate预约时间  currentPage=1  PageSize=-1 这样写才能导出全部的数据
+     * @return
+     * */
     public void exportExcel(HttpServletResponse response, TCovidVaccinateAppointment param) {
         log.info("导出新冠疫苗excel: {}", JSON.toJSONString(param));
         IPage<TCovidVaccinateAppointment> page =  getQueryPage(param);
@@ -84,7 +104,7 @@ public class CovidVaccinateAppointmentService {
             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());
@@ -96,10 +116,15 @@ public class CovidVaccinateAppointmentService {
         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<>();
-        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/InquiryOfConsultationFeeServer.java

@@ -6,6 +6,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.querydata.InquiryOfConsultationFeeMapper;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.querydata.InquiryOfConsultationFee;
@@ -16,6 +17,7 @@ import thyyxxk.webserver.utils.TokenUtil;
 
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
@@ -40,9 +42,9 @@ public class InquiryOfConsultationFeeServer {
     * 以及查询的数据的条件 startTime 开始时间 endTime结束时间
     * @return 返回一个map的集合 包含的分页的数据以及总的条数
     * */
-    public ResultVo<Map<String,Object>> InquiryOfConsultationFee(InquiryOfConsultationFee data){
+    public ResultVo<Map<String,Object>> inquiryOfConsultationFee(InquiryOfConsultationFee data){
         IPage<InquiryOfConsultationFee> page = queryPage(data);
-        Map<String,Object> map = new Hashtable<>();
+        Map<String,Object> map = new HashMap<>(Capacity.TWO);
         log.info("查询会诊费用==>操作人员：{}，开始时间：{}，结束时间：{}",
                 TokenUtil.getTokenUserId(),data.getStartTime(),data.getEndTime());
         map.put("total",page.getTotal());
@@ -77,7 +79,7 @@ public class InquiryOfConsultationFeeServer {
         log.info("导出会诊费用excel: {}", JSON.toJSONString(param));
         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];
@@ -88,7 +90,7 @@ public class InquiryOfConsultationFeeServer {
             content[i][3] = DateUtil.formatDatetime(pojo.getInputDate());
             content[i][4] = pojo.getDoctor();
             content[i][5] = pojo.getPosition();
-            content[i][6] = pojo.getChargeFee()+"￥";
+            content[i][6] = pojo.getChargeFee()+" ￥";
         }
         //传三个参数 一个是 固定的 response ，excel的头部信息，excel的内容
         ExcelUtil.exportExcel(response, title, content);