代码修改

business/base-service/src/main/java/com/yihu/jw/device/dao/DevicePatientHealthIndexDao.java

@@ -35,7 +35,7 @@ public interface DevicePatientHealthIndexDao
			"FROM\n" +
			"	wlyy_patient_health_index  a \n" +
			"	INNER JOIN base_patient b ON a.`user`=b.id \n" +
			"	INNER JOIN base_patient_doctor_relation c ON b.id=c.patient_id\n" +
			"	INNER JOIN wlyy_outpatient c ON b.id=c.patient\n" +
			"WHERE\n" +
			"	a.type IN ('1', '2' ) \n" +
			"	AND a.record_date BETWEEN ?1 AND ?2 \n" +

business/base-service/src/main/java/com/yihu/jw/label/WlyyPatientLabelDao.java

@@ -27,6 +27,9 @@ public interface WlyyPatientLabelDao extends JpaRepository<WlyyPatientLabelDO, S
    @Query("from WlyyPatientLabelDO w where  w.patient=?1 and w.labelCode=?2 and w.labelType=?3 ")
    List<WlyyPatientLabelDO> findByPatient(String patient, String labelCode, String labelType);
    @Query("from WlyyPatientLabelDO w where  w.patient=?1 and w.labelType='2' and w.labelName in ('高血压','糖尿病')")
    List<WlyyPatientLabelDO> findByPatient2(String patient);
    @Query("from WlyyPatientLabelDO w where w.labelType='4' and w.labelName=?1 ")
    List<WlyyPatientLabelDO> findByPatientLablelName(String labelName);
}

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@@ -3,7 +3,6 @@ package com.yihu.jw.patient.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.base.im.ConsultDo;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.entity.hospital.prescription.WlyyInspectionDO;
@@ -890,7 +889,7 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
        String sql="SELECT DISTINCT a.*\n" +
                "FROM\n" +
                "	base_patient a \n" +
                "	INNER JOIN base_patient_doctor_relation b ON a.id=b.patient_id\n" +
                "	INNER JOIN wlyy_outpatient b ON a.id=b.patient\n" +
                "WHERE 1=1\n" +
                "AND a.disease_condition IN('1','2','3')\n" +
                "AND a.disease IN ('1','2','1,2','2,1')\n" +

common/common-entity/src/db/2024.sql

@@ -213,14 +213,30 @@ INSERT INTO `base`.`oauth_wlyy_config` (`id`, `app_id`, `app_secret`, `token_url
INSERT INTO `base`.`oauth_wlyy_config` (`id`, `app_id`, `app_secret`, `token_url`, `url`, `remark`) VALUES ('uploadImg', '019bd04d-3cb2-433f-a530-03f0cdb083e5', '08cc3ec2-736b-4732-a8f0-f99eb6f9d311', 'https://www.xmtyw.cn/wlyytest/gc/accesstoken', 'https://www.xmtyw.cn/wlyytest/wlyygc/upload/file', '图片上传');
CREATE TABLE `wlyy_sign` (
    `id` int NOT NULL AUTO_INCREMENT,
    `idcard` varchar(50) DEFAULT NULL,
    `admin_team_id` int DEFAULT NULL,
    `create_time` datetime DEFAULT NULL,
    PRIMARY KEY (`id`),
    KEY `index1` (`idcard`),
    KEY `index2` (`admin_team_id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 ;
   `id` int NOT NULL AUTO_INCREMENT,
   `idcard` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '身份证',
   `admin_team_id` int DEFAULT NULL COMMENT '签约团队',
   `name` varchar(50) DEFAULT NULL COMMENT '姓名',
   `address` varchar(50) DEFAULT NULL COMMENT '地址',
   `hospital_name` varchar(50) DEFAULT NULL COMMENT '签约社区',
   `doctor_name` varchar(50) DEFAULT NULL COMMENT '全科医生',
   `health_doctor_name` varchar(50) DEFAULT NULL COMMENT '健管师',
   `begin` varchar(10) DEFAULT NULL COMMENT '签约开始时间',
   `end` varchar(10) DEFAULT NULL COMMENT '签约结束时间',
   `sign_year` varchar(1) DEFAULT NULL COMMENT '签约年限',
   `status` varchar(4) DEFAULT NULL COMMENT '状态',
   `sign_source` varchar(1) DEFAULT NULL COMMENT '签约类型',
   `disease_condition` varchar(5) DEFAULT NULL COMMENT '病情',
   `sys_time` varchar(30) DEFAULT NULL COMMENT '同步时间',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`),
   KEY `index2` (`admin_team_id`),
   KEY `index3` (`sys_time`),
   KEY `index4` (`hospital_name`,`doctor_name`,`health_doctor_name`),
   KEY `index1` (`patient`,`idcard`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
CREATE TABLE `wlyy_patient_aim_blood_pressure` (
      `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id主键，与业务逻辑无关',
@@ -249,4 +265,35 @@ CREATE TABLE `wlyy_patient_aim_blood_sugger` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='患者-血糖目标';
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
  `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
('ijk_sign_source1', NULL, 'ijk_sign_source', '1', '线下', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约类型');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
  ('ijk_sign_source2', NULL, 'ijk_sign_source', '2', '线上', NULL, '2', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约类型');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status1', NULL, 'ijk_sign_status', '-1', '患者已取消', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status2', NULL, 'ijk_sign_status', '-2', '已拒绝', NULL, '2', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status3', NULL, 'ijk_sign_status', '-3', '已解约', NULL, '3', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status4', NULL, 'ijk_sign_status', '-4', '已到期', NULL, '4', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status5', NULL, 'ijk_sign_status', '0', '待签约', NULL, '5', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status6', NULL, 'ijk_sign_status', '1', '已签约', NULL, '6', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status7', NULL, 'ijk_sign_status', '2', '患者申请取消签约', NULL, '7', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES
    ('ijk_sign_status8', NULL, 'ijk_sign_status', '3', '医生申请取消签约', NULL, '8', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/PatientDoctorRelationEntity.java

@@ -1,53 +0,0 @@
package com.yihu.jw.entity.base.patient;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * @author suqinyi
 * @Date 2024/3/5
 */
@Entity
@Table(name = "base_patient_doctor_relation")
public class PatientDoctorRelationEntity extends IdEntity {
    private String patientId;  //患者id
    private String doctorId; // 医生id
    private String sourceType;//来源类型，1线上就诊 ， 2i健康签约
    private Date createTime;//创建时间
    public String getPatientId() {
        return patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
    public String getDoctorId() {
        return doctorId;
    }
    public void setDoctorId(String doctorId) {
        this.doctorId = doctorId;
    }
    public String getSourceType() {
        return sourceType;
    }
    public void setSourceType(String sourceType) {
        this.sourceType = sourceType;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyySign.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.transaction.Transactional;
/**
 * i健康同安签约居民
@@ -14,8 +15,29 @@ import javax.persistence.Table;
@Table(name = "wlyy_sign")
public class WlyySign extends IdEntityWithCreateTime {
    private String patient;
    private String idcard;
    private String adminTeamId;
    private String name;//姓名
    private String address;//地址
    private String hospitalName;//签约社区
    private String doctorName;//全科医生
    private String healthDoctorName;//健管师
    private String begin;//签约开始时间
    private String end;//签约结束时间
    private String signYear;//签约年限
    private String status;//状态
    private String signSource;//签约类型
    private String diseaseCondition;//病情
    private String sysTime;//同步时间
    //非数据库字段
    private String statusName;//状态名称
    private String signSourceName;//签约来源
    private String health;//健康情况
    private String disease;//疾病标签
    private String zbType;//专病类型
    private String zdyGroup;//自定义分组
    @Column(name = "idcard")
    public String getIdcard() {
@@ -34,4 +56,163 @@ public class WlyySign extends IdEntityWithCreateTime {
    public void setAdminTeamId(String adminTeamId) {
        this.adminTeamId = adminTeamId;
    }
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    @Column(name = "hospital_name")
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    @Column(name = "health_doctor_name")
    public String getHealthDoctorName() {
        return healthDoctorName;
    }
    public void setHealthDoctorName(String healthDoctorName) {
        this.healthDoctorName = healthDoctorName;
    }
    @Column(name = "begin")
    public String getBegin() {
        return begin;
    }
    public void setBegin(String begin) {
        this.begin = begin;
    }
    @Column(name = "end")
    public String getEnd() {
        return end;
    }
    public void setEnd(String end) {
        this.end = end;
    }
    @Column(name = "sign_year")
    public String getSignYear() {
        return signYear;
    }
    public void setSignYear(String signYear) {
        this.signYear = signYear;
    }
    @Column(name = "status")
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(name = "sign_source")
    public String getSignSource() {
        return signSource;
    }
    public void setSignSource(String signSource) {
        this.signSource = signSource;
    }
    @Column(name = "disease_condition")
    public String getDiseaseCondition() {
        return diseaseCondition;
    }
    public void setDiseaseCondition(String diseaseCondition) {
        this.diseaseCondition = diseaseCondition;
    }
    @Column(name = "sys_time")
    public String getSysTime() {
        return sysTime;
    }
    public void setSysTime(String sysTime) {
        this.sysTime = sysTime;
    }
    @Transactional
    public String getHealth() {
        return health;
    }
    public void setHealth(String health) {
        this.health = health;
    }
    @Transactional
    public String getDisease() {
        return disease;
    }
    public void setDisease(String disease) {
        this.disease = disease;
    }
    @Transactional
    public String getZbType() {
        return zbType;
    }
    public void setZbType(String zbType) {
        this.zbType = zbType;
    }
    @Transactional
    public String getZdyGroup() {
        return zdyGroup;
    }
    public void setZdyGroup(String zdyGroup) {
        this.zdyGroup = zdyGroup;
    }
    @Transactional
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    @Transactional
    public String getSignSourceName() {
        return signSourceName;
    }
    public void setSignSourceName(String signSourceName) {
        this.signSourceName = signSourceName;
    }
}