上门服务工程

common/common-entity/src/main/java/com/yihu/jw/entity/base/system/SystemDictDO.java

@@ -31,6 +31,12 @@ public class SystemDictDO implements Serializable {
	//类型
	private Type type;
	@Column(name = "dict_name")
	private String dictName;
	@Column(name = "sort")
	private String sort;
	@Id
	@GeneratedValue(generator = "generator")
	@GenericGenerator(name = "generator", strategy = "assigned")
@@ -78,4 +84,20 @@ public class SystemDictDO implements Serializable {
	public void setType(Type type) {
		this.type = type;
	}
	public String getDictName() {
		return dictName;
	}
	public void setDictName(String dictName) {
		this.dictName = dictName;
	}
	public String getSort() {
		return sort;
	}
	public void setSort(String sort) {
		this.sort = sort;
	}
}

common/common-entity/src/main/java/com/yihu/jw/entity/followup/Followup.java

@@ -99,6 +99,16 @@ public class Followup extends IntegerIdentityEntity {
	private Integer doctorReadStatus;
	private Integer patientReadStatus;
	private String visitCount;//访视次序 (中度到重度慢阻肺)
	public String getVisitCount() {
		return visitCount;
	}
	public void setVisitCount(String visitCount) {
		this.visitCount = visitCount;
	}
	@Column(name = "doctor_read_status")
	public Integer getDoctorReadStatus() {
		return doctorReadStatus;

gateway/ag-basic/src/main/resources/application.yml

@@ -65,6 +65,9 @@ zuul:
    svr-base:
      path: /cityihealth/base/**
      serviceId: svr-base
    svr-visit-behind:
      path: /visitBehind/**
      serviceId: svr-visit-behind
#药柜预发布环境
    svr-base-yg:
      path: /cityihealth/baseygTest/**

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/consult/controller/ConsultController.java

@@ -12,6 +12,7 @@ import com.yihu.jw.entity.hospital.message.MessageNoticeSetting;
import com.yihu.jw.hospital.module.consult.service.ConsultTeamService;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.task.PushMsgTask;
import com.yihu.jw.hospital.utils.HttpUtil;
import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.dao.ConsultTeamDao;
import com.yihu.jw.im.util.ImUtil;
@@ -20,7 +21,6 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.CommonUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/dao/FollowUpDao.java

@@ -78,7 +78,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
            "BaseDoctorDO d, BaseDoctorDO c " +
            "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 " +
            "and (a.adminTeamCode = ?2 or a.doctorCode=?3) and a.status > '0' order by a.followupPlanDate")
    Page<Object> findByPatientAndTeam(String patient, Long teamCode, String doctor, PageRequest pageable);
    Page<Object> findByPatientAndTeam(String patient, Long teamCode, String doctor, Pageable pageable);
    /**
     * 查找所有的随访数据
@@ -90,7 +90,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
            "c.id,c.name,c.photo" + ",a.followupDate,a.followupPlanDate,a.followupNextDate,a.id,a.followupNo,a.prescriptionCode " +
            "from Followup a, BaseDoctorDO d, BaseDoctorDO c " +
            "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1  and a.status > '0'")
    Page<Object> findByPatient(String patient, PageRequest pageable);
    Page<Object> findByPatient(String patient, Pageable pageable);
    /**
     * 查找所有的随访计划（未开始的归类为计划）
@@ -102,7 +102,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
            "c.id,c.name,c.photo" + ",a.followupDate,a.followupPlanDate,a.followupNextDate,a.id,a.followupNo,a.prescriptionCode " +
            "from Followup a, BaseDoctorDO d, BaseDoctorDO c " +
            "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 and a.status = '2'")
    Page<Object> findPlanByPatient(String patient, PageRequest pageable);
    Page<Object> findPlanByPatient(String patient, Pageable pageable);
    /**
     * 查找所有的随访记录（进行中的，已完整的的归类为计划）
@@ -114,7 +114,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
            "c.id,c.name,c.photo" + ",a.followupDate,a.followupPlanDate,a.followupNextDate,a.id,a.followupNo,a.prescriptionCode " +
            "from Followup a, BaseDoctorDO d, BaseDoctorDO c" +
            " where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 and (a.status = '1' or a.status = '3')")
    Page<Object> findRecordByPatient(String patient, PageRequest pageable);
    Page<Object> findRecordByPatient(String patient, Pageable pageable);
    /**
     * 查找所有的随访计划（未开始的归类为计划）
@@ -129,7 +129,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
            "from Followup a, BaseDoctorDO d, BaseDoctorDO c where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 " +
            "and (a.adminTeamCode = ?2 or a.doctorCode=?3) and a.status = '2' " +
            "order by a.followupPlanDate")
    Page<Object> findPlanByPatientAndTeam(String patient, Long teamCode, String doctor, PageRequest pageable);
    Page<Object> findPlanByPatientAndTeam(String patient, Long teamCode, String doctor, Pageable pageable);
    /**
@@ -145,7 +145,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
            "from Followup a, BaseDoctorDO d, BaseDoctorDO c " +
            "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 " +
            "and (a.adminTeamCode = ?2 or a.doctorCode=?3) and (a.status = '1' or a.status = '3')  order by a.followupPlanDate")
    Page<Object> findRecordByPatientAndTeam(String patient, Long teamCode, String doctor, PageRequest pageable);
    Page<Object> findRecordByPatientAndTeam(String patient, Long teamCode, String doctor, Pageable pageable);
    /**
     * 根据续方CODE获取随访记录

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/task/PushMsgTask.java

@@ -6,10 +6,10 @@ import com.yihu.jw.entity.wechat.WechatPushLog;
import com.yihu.jw.entity.wechat.WechatTemplate;
import com.yihu.jw.entity.wechat.WechatTemplateData;
import com.yihu.jw.hospital.module.wx.dao.WechatPushLogDao;
import com.yihu.jw.hospital.utils.HttpUtil;
import com.yihu.jw.hospital.utils.WeiXinAccessTokenUtils;
import com.yihu.jw.hospital.utils.WeiXinOpenIdUtils;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONException;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/utils/WeiXinAccessTokenUtils.java

@@ -3,7 +3,6 @@ package com.yihu.jw.hospital.utils;
import com.yihu.jw.entity.base.wx.WxAccessTokenDO;
import com.yihu.jw.hospital.module.wx.service.AccessTokenService;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

svr/svr-visit-behind/src/main/resources/application.yml

@@ -1,6 +1,6 @@
#通用的配置不用区分环境变量
server:
  port: 10301
  port: 10302
spring:
  aop:
@@ -298,6 +298,38 @@ base:
cloudCare:
  deviceUrl: http://172.26.0.107:9112/
# 20231012新增的
server:
  server_url: https://ehr.yihu.com/wlyy/
  # 服务器图片改存FastDFS地址
  server_img_url: http://172.26.0.110:8888/
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: https://ehr.yihu.com/wlyy/
  target_url: home/html/unreadMessageStatistic.html
sign:
  check_upload_sign: http://172.19.103.88:8011/wlyy_sign
  check_upload: http://172.26.0.118:8085/wlyy_service
pushMes:
  # 1为推送redis,0为推送消息队列
  method: 0
  # redis队列名称
  redis_prescription_title: redisMessage
##如果是外网项目就是flase 内网是true
neiwang:
  enable: true
  wlyy: http://172.26.0.110:22122/
basedb:
  name: base
##拦截器开关
interceptor:
  accesstoken:
    status: 1 #  1开启 0 关闭
    time: 2 # #对外接的accesstoken生命周期 2小时
---
spring:
  profiles: jwprod