Merge branch 'dev' of wujunjie/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/Patient.java

@@ -15,8 +15,8 @@ import java.util.List;
/**
 * 患者信息
 * @author George
 *
 * @author George
 */
@Entity
@@ -24,419 +24,429 @@ import java.util.List;
public class Patient extends IdEntity implements Serializable {
	/**
	 * 
	 */
	private static final long serialVersionUID = 8358924836164389434L;
	// 业务主键
	private String code;
	// 身份证号
	private String idcard;
	// 登录密码
	private String password;
	private String salt;
	// 姓名
	private String name;
	// 生日
	private Date birthday;
	// 性別，1男，2女
	private Integer sex;
	// 手機號
	private String mobile;
	// （基卫）手機號
	private String mobileRemarks;
	// 聯繫電話
	private String phone;
	// 社保卡號
	private String ssc;
	// 頭像HTTP地址
	private String photo;
	// 省代碼
	private String province;
	// 城市代碼
	private String city;
	// 區縣代碼
	private String town;
	// 街道代码
	private String street;
	// 省名
	private String provinceName;
	// 市名
	private String cityName;
	// 區縣名
	private String townName;
	// 街道名称
	private String streetName;
	// 地址
	private String address;
	// 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
	private Integer disease;
	// 病情：0绿标，1黄标，2红标
	private Integer diseaseCondition;
	// 病历记录总数
	private Integer recordAmount;
	// 總積分
	private Integer points;
	// 更新時間
	private Date czrq;
	// 微信编号
	private String openid;
	//微信时间
	private Date openidTime;
	// 用户状态：1正常，0禁用，-1恶意注册，2审核中
	private Integer status;
	// 居委会字段id
	private String sickVillage;
	// 居委会字段名称
	private String sickVillageName;
//	是否绑定电子社保卡
	private Integer sicardStatus;
//	绑定电子社保卡时间
	private Date sicardTime;
	//是否分配过微信标签  1分配过 0或者空没有
	private Integer isWxtag;
	//微信iagId
	private Integer wxtagid;
	//居民预警状态：0为标准，1为预警状态
	private Integer standardStatus;
	public Integer getSicardStatus() {
		return sicardStatus;
	}
	public void setSicardStatus(Integer sicardStatus) {
		this.sicardStatus = sicardStatus;
	}
	public Date getSicardTime() {
		return sicardTime;
	}
	public void setSicardTime(Date sicardTime) {
		this.sicardTime = sicardTime;
	}
	private List<SignPatientLabelInfo> labelInfos=new ArrayList<>();//患者的疾病标签list
	public Patient() {
	}
	public Patient(Long id) {
		this.id = id;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getIdcard() {
		return idcard;
	}
	public void setIdcard(String idcard) {
		this.idcard = idcard;
	}
	public String getPassword() {
		return password;
	}
	public void setPassword(String password) {
		this.password = password;
	}
	public String getSalt() {
		return salt;
	}
	public void setSalt(String salt) {
		this.salt = salt;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
	public Date getBirthday() {
		return birthday;
	}
	public void setBirthday(Date birthday) {
		this.birthday = birthday;
	}
	public Integer getSex() {
		return sex;
	}
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	public String getMobile() {
		return mobile;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
	public String getPhone() {
		return phone;
	}
	public void setPhone(String phone) {
		this.phone = phone;
	}
    /**
     *
     */
    private static final long serialVersionUID = 8358924836164389434L;
    // 业务主键
    private String code;
    // 身份证号
    private String idcard;
    // 登录密码
    private String password;
    private String salt;
    // 姓名
    private String name;
    // 生日
    private Date birthday;
    // 性別，1男，2女
    private Integer sex;
    // 手機號
    private String mobile;
    // （基卫）手機號
    private String mobileRemarks;
    // 聯繫電話
    private String phone;
    // 社保卡號
    private String ssc;
    // 頭像HTTP地址
    private String photo;
    // 省代碼
    private String province;
    // 城市代碼
    private String city;
    // 區縣代碼
    private String town;
    // 街道代码
    private String street;
    // 省名
    private String provinceName;
    // 市名
    private String cityName;
    // 區縣名
    private String townName;
    // 街道名称
    private String streetName;
    // 地址
    private String address;
    // 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
    private Integer disease;
    // 病情：0绿标，1黄标，2红标
    private Integer diseaseCondition;
    // 病历记录总数
    private Integer recordAmount;
    // 總積分
    private Integer points;
    // 更新時間
    private Date czrq;
    // 微信编号
    private String openid;
    //微信时间
    private Date openidTime;
    // 用户状态：1正常，0禁用，-1恶意注册，2审核中
    private Integer status;
    // 居委会字段id
    private String sickVillage;
    // 居委会字段名称
    private String sickVillageName;
    //	绑定电子社保卡主体（本人为本人code，共济为操作人code）
    private String principalCode;
    //	是否绑定电子社保卡
    private Integer sicardStatus;
    //	绑定电子社保卡时间
    private Date sicardTime;
    //是否分配过微信标签  1分配过 0或者空没有
    private Integer isWxtag;
    //微信iagId
    private Integer wxtagid;
    //居民预警状态：0为标准，1为预警状态
    private Integer standardStatus;
    public String getPrincipalCode() {
        return principalCode;
    }
    public void setPrincipalCode(String principalCode) {
        this.principalCode = principalCode;
    }
    public Integer getSicardStatus() {
        return sicardStatus;
    }
    public void setSicardStatus(Integer sicardStatus) {
        this.sicardStatus = sicardStatus;
    }
    public Date getSicardTime() {
        return sicardTime;
    }
    public void setSicardTime(Date sicardTime) {
        this.sicardTime = sicardTime;
    }
    private List<SignPatientLabelInfo> labelInfos = new ArrayList<>();//患者的疾病标签list
    public Patient() {
    }
    public Patient(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    public String getSalt() {
        return salt;
    }
    public void setSalt(String salt) {
        this.salt = salt;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    public Date getBirthday() {
        return birthday;
    }
    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }
    public Integer getSex() {
        return sex;
    }
    public void setSex(Integer sex) {
        this.sex = sex;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    public String getSsc() {
        return ssc;
    }
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
    @Column(name = "photo", insertable = false)
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
    @Column(name = "province_name")
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    @Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
    public static long getSerialversionuid() {
        return serialVersionUID;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public Integer getDisease() {
        return disease;
    }
    public void setDisease(Integer disease) {
        this.disease = disease;
    }
    @Column(name = "disease_condition")
    public Integer getDiseaseCondition() {
        return diseaseCondition;
    }
    public void setDiseaseCondition(Integer diseaseCondition) {
        this.diseaseCondition = diseaseCondition;
    }
    @Column(name = "record_amount")
    public Integer getRecordAmount() {
        return recordAmount;
    }
    public void setRecordAmount(Integer recordAmount) {
        this.recordAmount = recordAmount;
    }
    public Integer getPoints() {
        return points;
    }
    public void setPoints(Integer points) {
        this.points = points;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
    public String getOpenid() {
        return openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Transient
    public List<SignPatientLabelInfo> getLabelInfos() {
        return labelInfos;
    }
    public void setLabelInfos(List<SignPatientLabelInfo> labelInfos) {
        this.labelInfos = labelInfos;
    }
    public String getMobileRemarks() {
        return mobileRemarks;
    }
    public void setMobileRemarks(String mobileRemarks) {
        this.mobileRemarks = mobileRemarks;
    }
    public Date getOpenidTime() {
        return openidTime;
    }
    public void setOpenidTime(Date openidTime) {
        this.openidTime = openidTime;
    }
	public String getSsc() {
		return ssc;
	}
	public void setSsc(String ssc) {
		this.ssc = ssc;
	}
	@Column(name = "photo", insertable = false)
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getProvince() {
		return province;
	}
	public void setProvince(String province) {
		this.province = province;
	}
	public String getCity() {
		return city;
	}
	public void setCity(String city) {
		this.city = city;
	}
	public String getTown() {
		return town;
	}
	public void setTown(String town) {
		this.town = town;
	}
	public String getStreet() {
		return street;
	}
	public void setStreet(String street) {
		this.street = street;
	}
	@Column(name = "province_name")
	public String getProvinceName() {
		return provinceName;
	}
	public void setProvinceName(String provinceName) {
		this.provinceName = provinceName;
	}
	@Column(name = "city_name")
	public String getCityName() {
		return cityName;
	}
	public void setCityName(String cityName) {
		this.cityName = cityName;
	}
	@Column(name = "town_name")
	public String getTownName() {
		return townName;
	}
	public void setTownName(String townName) {
		this.townName = townName;
	}
	@Column(name = "street_name")
	public String getStreetName() {
		return streetName;
	}
	public void setStreetName(String streetName) {
		this.streetName = streetName;
	}
	public static long getSerialversionuid() {
		return serialVersionUID;
	}
	public String getAddress() {
		return address;
	}
	public void setAddress(String address) {
		this.address = address;
	}
	public Integer getDisease() {
		return disease;
	}
	public void setDisease(Integer disease) {
		this.disease = disease;
	}
	@Column(name = "disease_condition")
	public Integer getDiseaseCondition() {
		return diseaseCondition;
	}
	public void setDiseaseCondition(Integer diseaseCondition) {
		this.diseaseCondition = diseaseCondition;
	}
	@Column(name = "record_amount")
	public Integer getRecordAmount() {
		return recordAmount;
	}
	public void setRecordAmount(Integer recordAmount) {
		this.recordAmount = recordAmount;
	}
	public Integer getPoints() {
		return points;
	}
	public void setPoints(Integer points) {
		this.points = points;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getOpenid() {
		return openid;
	}
	public void setOpenid(String openid) {
		this.openid = openid;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Transient
	public List<SignPatientLabelInfo> getLabelInfos() {
		return labelInfos;
	}
	public void setLabelInfos(List<SignPatientLabelInfo> labelInfos) {
		this.labelInfos = labelInfos;
	}
	public String getMobileRemarks() {
		return mobileRemarks;
	}
	public void setMobileRemarks(String mobileRemarks) {
		this.mobileRemarks = mobileRemarks;
	}
	public Date getOpenidTime() {
		return openidTime;
	}
	public void setOpenidTime(Date openidTime) {
		this.openidTime = openidTime;
	}
    public String getSickVillage() {
        return sickVillage;
    }
	public String getSickVillage() {
		return sickVillage;
	}
    public void setSickVillage(String sickVillage) {
        this.sickVillage = sickVillage;
    }
	public void setSickVillage(String sickVillage) {
		this.sickVillage = sickVillage;
	}
    public String getSickVillageName() {
        return sickVillageName;
    }
	public String getSickVillageName() {
		return sickVillageName;
	}
    public void setSickVillageName(String sickVillageName) {
        this.sickVillageName = sickVillageName;
    }
	public void setSickVillageName(String sickVillageName) {
		this.sickVillageName = sickVillageName;
	}
    public Integer getIsWxtag() {
        return isWxtag;
    }
	public Integer getIsWxtag() {
		return isWxtag;
	}
    public void setIsWxtag(Integer isWxtag) {
        this.isWxtag = isWxtag;
    }
	public void setIsWxtag(Integer isWxtag) {
		this.isWxtag = isWxtag;
	}
    public Integer getWxtagid() {
        return wxtagid;
    }
	public Integer getWxtagid() {
		return wxtagid;
	}
    public void setWxtagid(Integer wxtagid) {
        this.wxtagid = wxtagid;
    }
	public void setWxtagid(Integer wxtagid) {
		this.wxtagid = wxtagid;
	}
    //---------------------------常量----------------------------
    public enum isWchatTage {
        yes(1), no(0);
	//---------------------------常量----------------------------
	public enum isWchatTage{
		yes(1),no(0);
        isWchatTage(Integer value) {
            this.value = value;
        }
		isWchatTage(Integer value) {
			this.value = value;
		}
        private Integer value;
		private Integer value;
        public Integer getValue() {
            return value;
        }
		public Integer getValue() {
			return value;
		}
        public void setValue(Integer value) {
            this.value = value;
        }
    }
		public void setValue(Integer value) {
			this.value = value;
		}
	}
	public Integer getStandardStatus() {
		return standardStatus;
	}
    public Integer getStandardStatus() {
        return standardStatus;
    }
	public void setStandardStatus(Integer standardStatus) {
		this.standardStatus = standardStatus;
	}
    public void setStandardStatus(Integer standardStatus) {
        this.standardStatus = standardStatus;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/feedback/FeedbackService.java

@@ -43,8 +43,6 @@ public class FeedbackService extends BaseService {
    @Value("${wlyyService.api}")
    private String wlyyService;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private MessageDao messageDao;
    /**
@@ -216,7 +214,7 @@ public class FeedbackService extends BaseService {
                String keywords = patientName + "," + typeName + "," + result + "," + newDate;
                params.add(new BasicNameValuePair("keywords", keywords));
                httpClientUtil.post(url, params, "UTF-8");
                HttpClientUtil.post(url, params, "UTF-8");
            }
        } else if (identity == 2) {
            SimpleDateFormat formatDate = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
@@ -244,7 +242,7 @@ public class FeedbackService extends BaseService {
            params.add(new BasicNameValuePair("title", title));
            params.add(new BasicNameValuePair("content",content));
            httpClientUtil.post(url, params, "UTF-8");
            HttpClientUtil.post(url, params, "UTF-8");
            messageDao.save(message);
        }
        feedbackDao.save(feedback);

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/SicardQueryJob.java

@@ -0,0 +1,51 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.charge.ChargeDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.app.charge.OnePayService;
import com.yihu.wlyy.wechat.util.WeiXinAccessTokenUtils;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
/**
 * 处理电子社保卡绑定业务
 * Created by Reece on 2017/9/26/029.
 */
public class SicardQueryJob implements Job {
    private static final Logger logger = LoggerFactory.getLogger(SicardQueryJob.class);
    @Autowired
    private OnePayService payService;
    @Autowired
    private PatientDao patientDao;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        logger.info("SicardQueryJob start ..........");
        try {
            List<Patient> patientList = patientDao.listNotupdated();
            if (patientList != null && patientList.size() > 0) {
                for (Patient patient : patientList) {
                    try {
                        payService.bindCardList(patient.getOpenid());
                    } catch (Exception e) {
                        logger.info("SicardQueryJob error ..........continue this JOB,CODE:" + patient.getCode() + ",message:" + e.getMessage());
                        continue;
                    }
                }
            }
            logger.info("SicardQueryJob end ..........");
        } catch (Exception e) {
            e.printStackTrace();
            logger.info("SicardQueryJob error ..........,message:" + e.getMessage());
        }
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/patient/PatientDao.java

@@ -69,4 +69,8 @@ public interface PatientDao extends PagingAndSortingRepository<Patient, Long> {
    @Modifying
    @Query("update Patient p set p.diseaseCondition = ?2 where p.idcard = ?1")
    void updatePatientDiseascontionByIdcard(String idcard, Integer diseaseCondition);
    //获取已绑定社保卡但状态未更新数据(过滤掉为空情况)
    @Query(" select p from Patient p where password is null ")
    List<Patient> listNotupdated();
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/charge/BindCard.java

@@ -0,0 +1,53 @@
package com.yihu.wlyy.service.app.charge;
/**
 * 社保卡绑定信息
 * add by hzp at 20170524
 */
public class BindCard {
    private String attachCardNo;
    private String attachIdType;
    private String attachIdNo;
    private String attachName;
    private String attachRelation;   //01配偶 02父母 03子女  98本人 99未知
    public String getAttachCardNo() {
        return attachCardNo;
    }
    public void setAttachCardNo(String attachCardNo) {
        this.attachCardNo = attachCardNo;
    }
    public String getAttachIdType() {
        return attachIdType;
    }
    public void setAttachIdType(String attachIdType) {
        this.attachIdType = attachIdType;
    }
    public String getAttachIdNo() {
        return attachIdNo;
    }
    public void setAttachIdNo(String attachIdNo) {
        this.attachIdNo = attachIdNo;
    }
    public String getAttachName() {
        return attachName;
    }
    public void setAttachName(String attachName) {
        this.attachName = attachName;
    }
    public String getAttachRelation() {
        return attachRelation;
    }
    public void setAttachRelation(String attachRelation) {
        this.attachRelation = attachRelation;
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/charge/OnePayService.java

@@ -2,9 +2,11 @@ package com.yihu.wlyy.service.app.charge;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.entity.charge.WlyyCharge;
import com.yihu.wlyy.entity.organization.HospitalMapping;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.ylz.PayConfigura;
import com.yihu.wlyy.repository.charge.ChargeDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
@@ -441,4 +443,83 @@ public class OnePayService {
        charge.setUpdateTime(new Date());
        chargeDao.save(charge);
    }
    /**
     * 查询绑卡信息（所有卡）
     */
    public void bindCardList(String openid) throws Exception {
        Boolean isSuccess = true;
        String error = "";
        PayConfigura config = configuraDao.findWorkConfigura();
        try {
            String appId = config.getOnepayAppId();
            String appSecret = config.getOnepayAppSecret();
            OnepayDefaultClient onepayClient = new OnepayDefaultClient(config.getOnepayApi(), appId, appSecret, signType, encryptType);
            RequestParams requestParams = new RequestParams();
            requestParams.setAppId(appId);
            requestParams.setTimestamp(DateUtil.getCurrentDateTime());
            requestParams.setSignType(signType);
            requestParams.setEncryptType(encryptType);
            // 请求报文体参数，详见接口文档各接口——请求参数定义
            // 如医保绑卡信息请求参数
            JSONObject params = new JSONObject();
            params.put("openId", openid);
            params.put("accId", accId); //微信公众号开发者ID
            requestParams.setParam(params);
            requestParams.setTransType(config.getBindCardType());
            ResponseParams<JSONObject> res = onepayClient.execute(requestParams);
            // 如医保卡绑卡信息返回参数
            if (OnepayDefaultClient.isSuccessful(res)) {
                JavaType javaType = objectMapper.getTypeFactory().constructParametricType(List.class, BindCard.class);
                //获取本人绑卡情况
                String idNo = res.getParam().getString("idNo");
                Patient user = patientDao.findByIdcard(idNo);
                String userCode = user.getCode();
                List<BindCard> result = objectMapper.readValue(objectMapper.writeValueAsString(res.getParam().get("attachList")), javaType);
                //更新患者信息
                if (result != null && result.size() > 0) {
                    for (BindCard card : result) {
                        if (!"98".equals(card.getAttachRelation())) {
                            String idcard = card.getAttachIdNo();
                            Patient patient = patientDao.findByIdcard(idcard);
                            patient.setSicardStatus(1);
//                            ********************以绑定时为主****************
                            patient.setSicardTime(new Date());
//                            ************************************
                            patient.setPrincipalCode(userCode);
                            patientDao.save(patient);
                        }
                    }
                }
                user.setSicardStatus(1);
//                            ********************以绑定时为主****************
                user.setSicardTime(new Date());
//                            ************************************
                user.setPrincipalCode(userCode);
                patientDao.save(user);
            } else {
                isSuccess = false;
                error = "请求失败,返回结果:" + res.getRespCode() + "," + res.getRespMsg();
            }
        } catch (Exception ex) {
            isSuccess = false;
            StringWriter sw = new StringWriter();
            PrintWriter pw = new PrintWriter(sw);
            ex.printStackTrace(pw);
            error = sw.toString();
        }
        if (!isSuccess) {
            throw new Exception(error);
        }
        LOGGER.info(error);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/feedback/FeedbackTemplateController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "/doctor/feedback")
@Api(description = "医生端意见反馈")
public class FeedbackTemplateController extends BaseController {
public class DoctorFeedbackTemplateController extends BaseController {
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/feedback/FeedbackTemplateController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "/patient/feedback")
@Api(description = "居民端意见反馈")
public class FeedbackTemplateController extends BaseController {
public class PatientFeedbackTemplateController extends BaseController {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/vo/PatientModel.java

@@ -72,6 +72,9 @@ public class PatientModel {
    // 居委会字段名称
    @ApiModelProperty(value = "居委会字段名称", required = false, access = "response")
    private String sickVillageName;
    //	绑定电子社保卡主体
    @ApiModelProperty(value = "绑定电子社保卡主体", required = false, access = "response")
    private String principalCode;
    //	是否绑定电子社保卡
    @ApiModelProperty(value = "是否绑定电子社保卡", required = false, access = "response")
    private Integer sicardStatus;
@@ -86,6 +89,14 @@ public class PatientModel {
    @ApiModelProperty(value = "年龄", required = false, access = "response")
    private Integer age;
    public String getPrincipalCode() {
        return principalCode;
    }
    public void setPrincipalCode(String principalCode) {
        this.principalCode = principalCode;
    }
    public String getCode() {
        return code;
    }