Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -21,6 +21,7 @@ import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.restmodel.hospital.statistics.ScreenQvo;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
import jxl.Workbook;
import jxl.format.VerticalAlignment;
import jxl.write.*;
@@ -81,6 +82,8 @@ public class StatisticsEsService {
    @Autowired
    private WlyyHospitalSysDictDao sysDictDao;//字典
    @Autowired
    WlyyHttpService wlyyHttpService;
    /**
@@ -6254,17 +6257,23 @@ public class StatisticsEsService {
    public JSONObject getConsultAndPrescriptionList(ScreenQvo qvo) throws Exception {
        JSONObject result = new JSONObject();
        if (qvo.getFlag() == 1) {
            //本月
            qvo.setStartDate(DateUtil.getFirstMonthDay());
            qvo.setEndDate(DateUtil.getLastMonthDay());
            if (StringUtils.isBlank(qvo.getStartDate())) {
                //本月
                qvo.setStartDate(DateUtil.getFirstMonthDay());
                qvo.setEndDate(DateUtil.getLastMonthDay());
            }
        } else if (qvo.getFlag() == 2) {
            //近半年
            qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
            qvo.setEndDate(DateUtil.getStringDateShort());
            if (StringUtils.isBlank(qvo.getStartDate())) {
                //近半年
                qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
                qvo.setEndDate(DateUtil.getStringDateShort());
            }
        } else if (qvo.getFlag() == 3) {
            //全年
            qvo.setStartDate(DateUtil.getCurrentYearStartTime());
            qvo.setEndDate(DateUtil.getCurrentYearEndTime());
            if (StringUtils.isBlank(qvo.getStartDate())) {
                //全年
                qvo.setStartDate(DateUtil.getCurrentYearStartTime());
                qvo.setEndDate(DateUtil.getCurrentYearEndTime());
            }
        }
        HashMap<String, String> map = new HashMap<>();
@@ -7672,4 +7681,22 @@ public class StatisticsEsService {
    }
    /**
     * 调用i健康的接口查询家庭信息【市民健康】
     */
    public JSONObject getFamilyRelationByIjk(ScreenQvo qvo) {
        String param = "?idCard=" + qvo.getIdcard();
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getHospitalList", param);
        return re;
    }
    /**
     * 调用i健康就诊情况
     */
    public JSONObject getEventByIjk(ScreenQvo qvo) {
        String param = "?&ssc=" + qvo.getSsc() + "&type=1&page=1&pageSize=20";
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getEventList", param);
        return re;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/statistics/ScreenQvo.java

@@ -12,137 +12,154 @@ public class ScreenQvo {
//   lowLevel  下一级区域等级
    private String startDate;//开始时间
    private String endDate;//结束时间
   private String startDate;//开始时间
   private String endDate;//结束时间
    private String area;//区域code
    private int level;//等级
    private String index;//指标
   private String area;//区域code
   private int level;//等级
   private String index;//指标
    private int flag;//1本月 2近半年 3全年
   private int flag;//1本月 2近半年 3全年
    private String timeType;//查询时间范围 1 按天  3按月
   private String timeType;//查询时间范围 1 按天  3按月
    private String deptCode;//科室code
    private String deptName;//科室名称
    private String doctorName;//医生名称
   private String deptCode;//科室code
   private String deptName;//科室名称
   private String doctorName;//医生名称
    private int page;
    private int pageSize;
    private String pageSwitch;//1是0否  分页开关
    private String type;//类型
    private String idcard;
    private String ssc;//社保卡号
   private int page;
   private int pageSize;
   private String pageSwitch;//1是0否  分页开关
   private String type;//类型
    public String getIdcard() {
        return idcard;
    }
   public String getDeptName() {
      return deptName;
   }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
   public void setDeptName(String deptName) {
      this.deptName = deptName;
   }
    public String getDeptName() {
        return deptName;
    }
   public String getType() {
      return type;
   }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
   public void setType(String type) {
      this.type = type;
   }
    public String getType() {
        return type;
    }
   public int getFlag() {
      return flag;
   }
    public void setType(String type) {
        this.type = type;
    }
   public void setFlag(int flag) {
      this.flag = flag;
   }
    public int getFlag() {
        return flag;
    }
   public String getStartDate() {
      return startDate;
   }
    public void setFlag(int flag) {
        this.flag = flag;
    }
   public void setStartDate(String startDate) {
      this.startDate = startDate;
   }
    public String getStartDate() {
        return startDate;
    }
   public String getEndDate() {
      return endDate;
   }
    public void setStartDate(String startDate) {
        this.startDate = startDate;
    }
   public void setEndDate(String endDate) {
      this.endDate = endDate;
   }
    public String getEndDate() {
        return endDate;
    }
   public String getArea() {
      return area;
   }
    public void setEndDate(String endDate) {
        this.endDate = endDate;
    }
   public void setArea(String area) {
      this.area = area;
   }
    public String getArea() {
        return area;
    }
   public int getLevel() {
      return level;
   }
    public void setArea(String area) {
        this.area = area;
    }
   public void setLevel(int level) {
      this.level = level;
   }
    public int getLevel() {
        return level;
    }
   public String getIndex() {
      return index;
   }
    public void setLevel(int level) {
        this.level = level;
    }
   public void setIndex(String index) {
      this.index = index;
   }
    public String getIndex() {
        return index;
    }
   public String getTimeType() {
      return timeType;
   }
    public void setIndex(String index) {
        this.index = index;
    }
   public void setTimeType(String timeType) {
      this.timeType = timeType;
   }
    public String getTimeType() {
        return timeType;
    }
   public int getPage() {
      return page;
   }
    public void setTimeType(String timeType) {
        this.timeType = timeType;
    }
   public void setPage(int page) {
      this.page = page;
   }
    public int getPage() {
        return page;
    }
   public int getPageSize() {
      return pageSize;
   }
    public void setPage(int page) {
        this.page = page;
    }
   public void setPageSize(int pageSize) {
      this.pageSize = pageSize;
   }
    public int getPageSize() {
        return pageSize;
    }
   public String getPageSwitch() {
      return pageSwitch;
   }
    public void setPageSize(int pageSize) {
        this.pageSize = pageSize;
    }
   public void setPageSwitch(String pageSwitch) {
      this.pageSwitch = pageSwitch;
   }
    public String getPageSwitch() {
        return pageSwitch;
    }
   public String getDeptCode() {
      return deptCode;
   }
    public void setPageSwitch(String pageSwitch) {
        this.pageSwitch = pageSwitch;
    }
   public void setDeptCode(String deptCode) {
      this.deptCode = deptCode;
   }
    public String getDeptCode() {
        return deptCode;
    }
    public void setDeptCode(String deptCode) {
        this.deptCode = deptCode;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
   public String getDoctorName() {
      return doctorName;
   public String getSsc() {
      return ssc;
   }
   public void setDoctorName(String doctorName) {
      this.doctorName = doctorName;
   public void setSsc(String ssc) {
      this.ssc = ssc;
   }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@@ -13,7 +13,6 @@ import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1592,7 +1591,6 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * 查询所有科室和医生
     * strJson={"type":"1","deptName":"心脏"}
@@ -1612,7 +1610,6 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * 查询服务评价详情
     * strJson={"startDate":"2020-07-18","endDate":"2023-11-29","deptCode":"1110000","deptName":"梁敬兴","pageSwitch":"1","page":1,"pageSize":10}
@@ -1648,8 +1645,42 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
        }
    }
    /**
     * 调用i健康获取居民家庭成员关系信息列表
     */
    @GetMapping(value = "/getFamilyRelationByIjk")
    @ApiOperation(value = "获取居民家庭成员关系信息列表")
    public Envelop getFamilyRelationByIjk(@RequestParam(required = true) String strJson) {
        try {
            ScreenQvo qvo = JSON.parseObject(strJson, ScreenQvo.class);
            JSONObject result = statisticsEsService.getFamilyRelationByIjk(qvo);
            return success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("系统繁忙");
        }
    }
    /**
     * 调用i健康就诊情况
     */
    @GetMapping(value = "/getEventByIjk")
    @ApiOperation(value = "获取居民家庭成员关系信息列表")
    public Envelop getEventByIjk(@RequestParam(required = true) String strJson) {
        try {
            ScreenQvo qvo = JSON.parseObject(strJson, ScreenQvo.class);
            JSONObject result = statisticsEsService.getEventByIjk(qvo);
            return success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("系统繁忙");
        }
    }
    /**
     * 调用i健康查询体征信息
     */
}