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

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

@@ -0,0 +1,116 @@
//package com.yihu.wlyy.entity.patient.prenatal;
//
//import com.fasterxml.jackson.annotation.JsonFormat;
//import com.yihu.wlyy.entity.IdEntity;
//
//import javax.persistence.Column;
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.io.Serializable;
//import java.util.Date;
//
///**
// * 居民疫苗接种情况明细
// * Created by yeshijie on 2017/10/17.
// */
//@Entity
//@Table(name = "wlyy_child_immune_detail_info")
//public class ChildImmuneDetailInfo extends IdEntity implements Serializable {
//
//    private String childCode;//'新生儿code'
//    private String name;//'姓名'
//    private String idcard;//'身份证'
//    private String immuneDictCode;//'疫苗库code'
//    private Date startTime;//'预计接种开始时间'
//    private Date endTime;//'预计接种结束时间'
//    private Date immuneTime;//'接种时间'
//    private Integer status;//状态 超期-1>待接种0>已接种1>未到年龄2
//    private String needle;//'针数'
//    private Date createTime;//
//
//    public String getChildCode() {
//        return childCode;
//    }
//
//    public void setChildCode(String childCode) {
//        this.childCode = childCode;
//    }
//
//    public String getName() {
//        return name;
//    }
//
//    public void setName(String name) {
//        this.name = name;
//    }
//
//    public String getIdcard() {
//        return idcard;
//    }
//
//    public void setIdcard(String idcard) {
//        this.idcard = idcard;
//    }
//
//    public String getImmuneDictCode() {
//        return immuneDictCode;
//    }
//
//    public void setImmuneDictCode(String immuneDictCode) {
//        this.immuneDictCode = immuneDictCode;
//    }
//
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "start_time")
//    public Date getStartTime() {
//        return startTime;
//    }
//
//    public void setStartTime(Date startTime) {
//        this.startTime = startTime;
//    }
//
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "end_time")
//    public Date getEndTime() {
//        return endTime;
//    }
//
//    public void setEndTime(Date endTime) {
//        this.endTime = endTime;
//    }
//
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "immune_time")
//    public Date getImmuneTime() {
//        return immuneTime;
//    }
//
//    public void setImmuneTime(Date immuneTime) {
//        this.immuneTime = immuneTime;
//    }
//
//    public Integer getStatus() {
//        return status;
//    }
//
//    public void setStatus(Integer status) {
//        this.status = status;
//    }
//
//    public String getNeedle() {
//        return needle;
//    }
//
//    public void setNeedle(String needle) {
//        this.needle = needle;
//    }
//
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//}

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

@@ -0,0 +1,127 @@
//package com.yihu.wlyy.entity.patient.prenatal;
//
//import com.yihu.wlyy.entity.IdEntity;
//
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.io.Serializable;
//import java.util.Date;
//
///**
// * 居民疫苗接种情况
// * Created by yeshijie on 2017/10/17.
// */
//@Entity
//@Table(name = "wlyy_child_immune_info")
//public class ChildImmuneInfo extends IdEntity implements Serializable {
//
//    private String code;//
//    private String childCode;//'新生儿code'
//    private String name;//'姓名'
//    private String idcard;//'身份证'
//    private String immuneDictCode;//'疫苗库code'
//    private String immuneName;//'疫苗名称'
//    private String immuneCode;//'疫苗code'
//    private String hospital;//'医院code'
//    private String hospitalName;//'医院名称'
//    private Integer status;//状态 超期-1>待接种0>已接种1>未到年龄2
//    private Integer del;//删除标志  0作废，1正常
//    private Date createTime;//
//
//
//    public String getChildCode() {
//        return childCode;
//    }
//
//    public void setChildCode(String childCode) {
//        this.childCode = childCode;
//    }
//
//    public String getName() {
//        return name;
//    }
//
//    public void setName(String name) {
//        this.name = name;
//    }
//
//    public String getIdcard() {
//        return idcard;
//    }
//
//    public void setIdcard(String idcard) {
//        this.idcard = idcard;
//    }
//
//    public String getImmuneDictCode() {
//        return immuneDictCode;
//    }
//
//    public void setImmuneDictCode(String immuneDictCode) {
//        this.immuneDictCode = immuneDictCode;
//    }
//
//    public Integer getStatus() {
//        return status;
//    }
//
//    public void setStatus(Integer status) {
//        this.status = status;
//    }
//
//    public String getCode() {
//        return code;
//    }
//
//    public void setCode(String code) {
//        this.code = code;
//    }
//
//    public String getImmuneName() {
//        return immuneName;
//    }
//
//    public void setImmuneName(String immuneName) {
//        this.immuneName = immuneName;
//    }
//
//    public String getImmuneCode() {
//        return immuneCode;
//    }
//
//    public void setImmuneCode(String immuneCode) {
//        this.immuneCode = immuneCode;
//    }
//
//    public String getHospital() {
//        return hospital;
//    }
//
//    public void setHospital(String hospital) {
//        this.hospital = hospital;
//    }
//
//    public String getHospitalName() {
//        return hospitalName;
//    }
//
//    public void setHospitalName(String hospitalName) {
//        this.hospitalName = hospitalName;
//    }
//
//    public Integer getDel() {
//        return del;
//    }
//
//    public void setDel(Integer del) {
//        this.del = del;
//    }
//
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//}

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

@@ -0,0 +1,157 @@
//package com.yihu.wlyy.entity.patient.prenatal;
//
//import com.fasterxml.jackson.annotation.JsonFormat;
//import com.yihu.wlyy.entity.IdEntity;
//
//import javax.persistence.Column;
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.io.Serializable;
//import java.util.Date;
//
///**
// * 新生儿信息
// * Created by yeshijie on 2017/10/17.
// */
//@Entity
//@Table(name = "wlyy_child_info")
//public class ChildInfo extends IdEntity implements Serializable {
//
//    private String code;//
//    private String name;//姓名
//    private String idcard;//新生儿身份证
//    private String photo;//头像
//    private String barcodeNo;//新生儿条形码
//    private String sickSex;//性别
//    private Date birthday;//出生日期
//    private String weight;//体重
//    private String height;//身长
//    private String deliverOrgName;//助产医院
//    private String deliverPerson;//接生人
//    private String cardNo;//产妇医保卡
//    private String sickName;//母亲姓名
//    private String identityCardNo;//母亲身份证
//    private Date createTime;//
//
//    public String getPhoto() {
//        return photo;
//    }
//
//    public void setPhoto(String photo) {
//        this.photo = photo;
//    }
//
//    public String getBarcodeNo() {
//        return barcodeNo;
//    }
//
//    public void setBarcodeNo(String barcodeNo) {
//        this.barcodeNo = barcodeNo;
//    }
//
//    public String getSickSex() {
//        return sickSex;
//    }
//
//    public void setSickSex(String sickSex) {
//        this.sickSex = sickSex;
//    }
//
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "birthday")
//    public Date getBirthday() {
//        return birthday;
//    }
//
//    public void setBirthday(Date birthday) {
//        this.birthday = birthday;
//    }
//
//    public String getWeight() {
//        return weight;
//    }
//
//    public void setWeight(String weight) {
//        this.weight = weight;
//    }
//
//    public String getHeight() {
//        return height;
//    }
//
//    public void setHeight(String height) {
//        this.height = height;
//    }
//
//    public String getDeliverOrgName() {
//        return deliverOrgName;
//    }
//
//    public void setDeliverOrgName(String deliverOrgName) {
//        this.deliverOrgName = deliverOrgName;
//    }
//
//    public String getDeliverPerson() {
//        return deliverPerson;
//    }
//
//    public void setDeliverPerson(String deliverPerson) {
//        this.deliverPerson = deliverPerson;
//    }
//
//    public String getCardNo() {
//        return cardNo;
//    }
//
//    public void setCardNo(String cardNo) {
//        this.cardNo = cardNo;
//    }
//
//    public String getSickName() {
//        return sickName;
//    }
//
//    public void setSickName(String sickName) {
//        this.sickName = sickName;
//    }
//
//    public String getIdentityCardNo() {
//        return identityCardNo;
//    }
//
//    public void setIdentityCardNo(String identityCardNo) {
//        this.identityCardNo = identityCardNo;
//    }
//
//    public String getName() {
//        return name;
//    }
//
//    public void setName(String name) {
//        this.name = name;
//    }
//
//    public String getIdcard() {
//        return idcard;
//    }
//
//    public void setIdcard(String idcard) {
//        this.idcard = idcard;
//    }
//
//    public String getCode() {
//        return code;
//    }
//
//    public void setCode(String code) {
//        this.code = code;
//    }
//
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//}

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

@@ -0,0 +1,108 @@
//package com.yihu.wlyy.entity.patient.prenatal;
//
//import com.yihu.wlyy.entity.IdEntity;
//
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.io.Serializable;
//import java.util.Date;
//
///**
// * 疫苗字典库表
// * Created by yeshijie on 2017/10/17.
// */
//@Entity
//@Table(name = "wlyy_immune_dict")
//public class ImmuneDict extends IdEntity implements Serializable {
//
//    private String code;//
//    private String immuneName;//疫苗名称
//    private String immuneCode;//疫苗code
//    private Integer immuneType;//疫苗类型(1一类疫苗,2二类疫苗)
//    private String price;//费用明细
//    private Integer priceType;//费用类型 1免费，2自费
//    private String remark;//说明
//    private Integer effectiveSign;//生效标志 0失效，1生效
//    private Integer del;//删除标志  0作废，1正常
//    private Date createTime;//
//
//    public Integer getImmuneType() {
//        return immuneType;
//    }
//
//    public void setImmuneType(Integer immuneType) {
//        this.immuneType = immuneType;
//    }
//
//    public String getPrice() {
//        return price;
//    }
//
//    public void setPrice(String price) {
//        this.price = price;
//    }
//
//    public Integer getPriceType() {
//        return priceType;
//    }
//
//    public void setPriceType(Integer priceType) {
//        this.priceType = priceType;
//    }
//
//    public String getRemark() {
//        return remark;
//    }
//
//    public void setRemark(String remark) {
//        this.remark = remark;
//    }
//
//    public Integer getEffectiveSign() {
//        return effectiveSign;
//    }
//
//    public void setEffectiveSign(Integer effectiveSign) {
//        this.effectiveSign = effectiveSign;
//    }
//
//    public String getCode() {
//        return code;
//    }
//
//    public void setCode(String code) {
//        this.code = code;
//    }
//
//    public String getImmuneName() {
//        return immuneName;
//    }
//
//    public void setImmuneName(String immuneName) {
//        this.immuneName = immuneName;
//    }
//
//    public String getImmuneCode() {
//        return immuneCode;
//    }
//
//    public void setImmuneCode(String immuneCode) {
//        this.immuneCode = immuneCode;
//    }
//
//    public Integer getDel() {
//        return del;
//    }
//
//    public void setDel(Integer del) {
//        this.del = del;
//    }
//
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//}

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

@@ -0,0 +1,135 @@
//package com.yihu.wlyy.entity.patient.prenatal;
//
//import com.yihu.wlyy.entity.IdEntity;
//
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.io.Serializable;
//import java.util.Date;
//
///**
// * 社区疫苗字典库表
// * Created by yeshijie on 2017/10/17.
// */
//@Entity
//@Table(name = "wlyy_immune_hostpital_dict")
//public class ImmuneHospitalDict extends IdEntity implements Serializable {
//
//    private String code;//
//    private String immuneDictCode;//'字典库code'
//    private String immuneName;//疫苗名称
//    private String immuneCode;//疫苗code
//    private Integer immuneType;//疫苗类型(1一类疫苗,2二类疫苗)
//    private String hospital;//'医院code'
//    private String hospitalName;//'医院编码'
//    private String price;//费用明细
//    private Integer priceType;//费用类型 1免费，2自费
//    private String remark;//说明
//    private Integer effectiveSign;//生效标志 0失效，1生效
//    private Integer del;//删除标志  0作废，1正常
//    private Date createTime;//
//
//    public String getImmuneDictCode() {
//        return immuneDictCode;
//    }
//
//    public void setImmuneDictCode(String immuneDictCode) {
//        this.immuneDictCode = immuneDictCode;
//    }
//
//    public String getHospital() {
//        return hospital;
//    }
//
//    public void setHospital(String hospital) {
//        this.hospital = hospital;
//    }
//
//    public String getHospitalName() {
//        return hospitalName;
//    }
//
//    public void setHospitalName(String hospitalName) {
//        this.hospitalName = hospitalName;
//    }
//
//    public Integer getImmuneType() {
//        return immuneType;
//    }
//
//    public void setImmuneType(Integer immuneType) {
//        this.immuneType = immuneType;
//    }
//
//    public String getPrice() {
//        return price;
//    }
//
//    public void setPrice(String price) {
//        this.price = price;
//    }
//
//    public Integer getPriceType() {
//        return priceType;
//    }
//
//    public void setPriceType(Integer priceType) {
//        this.priceType = priceType;
//    }
//
//    public String getRemark() {
//        return remark;
//    }
//
//    public void setRemark(String remark) {
//        this.remark = remark;
//    }
//
//    public Integer getEffectiveSign() {
//        return effectiveSign;
//    }
//
//    public void setEffectiveSign(Integer effectiveSign) {
//        this.effectiveSign = effectiveSign;
//    }
//
//    public String getCode() {
//        return code;
//    }
//
//    public void setCode(String code) {
//        this.code = code;
//    }
//
//    public String getImmuneName() {
//        return immuneName;
//    }
//
//    public void setImmuneName(String immuneName) {
//        this.immuneName = immuneName;
//    }
//
//    public String getImmuneCode() {
//        return immuneCode;
//    }
//
//    public void setImmuneCode(String immuneCode) {
//        this.immuneCode = immuneCode;
//    }
//
//    public Integer getDel() {
//        return del;
//    }
//
//    public void setDel(Integer del) {
//        this.del = del;
//    }
//
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//}

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

@@ -0,0 +1,72 @@
//package com.yihu.wlyy.entity.patient.prenatal;
//
//import com.yihu.wlyy.entity.IdEntity;
//
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.io.Serializable;
//import java.util.Date;
//
///**
// * 二类疫苗代替一类对应表
// * Created by yeshijie on 2017/10/17.
// */
//@Entity
//@Table(name = "wlyy_immune_mapping")
//public class ImmuneMapping extends IdEntity implements Serializable {
//
//    private String code;//
//    private String twoImmuneDictCode;//'二类疫苗字典库code'
//    private String twoImmuneName;//'二类疫苗名称'
//    private String oneImmuneDictCode;//'一类疫苗字典库code'
//    private String oneImmuneName;//'一类疫苗名称'
//    private Date createTime;//
//
//    public String getCode() {
//        return code;
//    }
//
//    public void setCode(String code) {
//        this.code = code;
//    }
//
//    public String getTwoImmuneDictCode() {
//        return twoImmuneDictCode;
//    }
//
//    public void setTwoImmuneDictCode(String twoImmuneDictCode) {
//        this.twoImmuneDictCode = twoImmuneDictCode;
//    }
//
//    public String getTwoImmuneName() {
//        return twoImmuneName;
//    }
//
//    public void setTwoImmuneName(String twoImmuneName) {
//        this.twoImmuneName = twoImmuneName;
//    }
//
//    public String getOneImmuneDictCode() {
//        return oneImmuneDictCode;
//    }
//
//    public void setOneImmuneDictCode(String oneImmuneDictCode) {
//        this.oneImmuneDictCode = oneImmuneDictCode;
//    }
//
//    public String getOneImmuneName() {
//        return oneImmuneName;
//    }
//
//    public void setOneImmuneName(String oneImmuneName) {
//        this.oneImmuneName = oneImmuneName;
//    }
//
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//}

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

@@ -0,0 +1,72 @@
//package com.yihu.wlyy.entity.patient.prenatal;
//
//import com.yihu.wlyy.entity.IdEntity;
//
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.io.Serializable;
//import java.util.Date;
//
///**
// * 疫苗字典库针数表
// * Created by yeshijie on 2017/10/17.
// */
//@Entity
//@Table(name = "wlyy_immune_needle")
//public class ImmuneNeedle extends IdEntity implements Serializable {
//
//    private String immuneDictCode;//疫苗库code
//    private String age;//儿童年龄
//    private String startMonths;//接种开始月份数
//    private String endMonths;//接种结束月份数
//    private String needle;//针数
//    private Date createTime;//
//
//    public String getAge() {
//        return age;
//    }
//
//    public void setAge(String age) {
//        this.age = age;
//    }
//
//    public String getImmuneDictCode() {
//        return immuneDictCode;
//    }
//
//    public void setImmuneDictCode(String immuneDictCode) {
//        this.immuneDictCode = immuneDictCode;
//    }
//
//    public String getStartMonths() {
//        return startMonths;
//    }
//
//    public void setStartMonths(String startMonths) {
//        this.startMonths = startMonths;
//    }
//
//    public String getEndMonths() {
//        return endMonths;
//    }
//
//    public void setEndMonths(String endMonths) {
//        this.endMonths = endMonths;
//    }
//
//    public String getNeedle() {
//        return needle;
//    }
//
//    public void setNeedle(String needle) {
//        this.needle = needle;
//    }
//
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//}

common/common-entity/src/main/java/com/yihu/wlyy/entity/wechat/WechatPushLog.java

@@ -0,0 +1,92 @@
package com.yihu.wlyy.entity.wechat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 微信模板推送日志
 * Created by yeshijie on 2017/10/18.
 */
@Entity
@Table(name = "wlyy_wx_push_log")
public class WechatPushLog extends IdEntity {
    private Integer type;// '推送类型',
    //1：签约成功  2：签约失败  3：咨询回复通知  4：健康指导提醒  5：解约申请通知  6：预约挂号成功通知  7：预约取消通知 8 缴费提醒 9 健康教育  10 签约医生变更（信息变更通知）续方订单配送员已顺利取药
    //12.添加家人申请 13.添加家人申请成功 14.添加家人申请失败 16.续签家庭医生 17.医生评价 91.医生助手 92.医生助手项目gcMessageController发送
    //18 产检提醒和产检就诊提醒 19:续方审核结果通知（0.不通过 1.通过 2。调整处方并通过） 20:服务结果通知（续方订单已成功配送） 11.代办事项通知（完成配药）
    private String openid;
    private String patient;//'居民code',
    private String name;//'居民姓名',
    private String request;//'请求入参',
    private String response;// '返回值',
    private Integer status;//'状态（0失败，1成功）',
    private Date createTime;
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public String getOpenid() {
        return openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getRequest() {
        return request;
    }
    public void setRequest(String request) {
        this.request = request;
    }
    public String getResponse() {
        return response;
    }
    public void setResponse(String response) {
        this.response = response;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

@@ -238,6 +238,8 @@ public class PrescriptionService extends ZysoftBaseService{
                    //新增续方日志
                    addPrescriptionLog(prescription,"接收线下处方调整完成消息-"+msg);
                }else{
                    error = "code:"+prescription.getCode()+",status:"+prescription.getStatus();
                }
            }
        }catch (JSONException ex){
@@ -390,7 +392,11 @@ public class PrescriptionService extends ZysoftBaseService{
//                redisTemplate.watch(channelTopic);
                    redisTemplate.opsForList().leftPush(channelTopic,message.toString());
//                redisTemplate.unwatch();
                }else {
                    error = "code:"+prescription.getCode()+",status:"+prescription.getStatus();
                }
            }else{
                error = "code:"+code;
            }
        }catch (JSONException ex){

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/repository/wechat/WechatPushLogDao.java

@@ -0,0 +1,11 @@
package com.yihu.wlyy.repository.wechat;
import com.yihu.wlyy.entity.wechat.WechatPushLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2017/10/18.
 */
public interface WechatPushLogDao extends PagingAndSortingRepository<WechatPushLog, Long>, JpaSpecificationExecutor<WechatPushLog> {
}

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/service/app/family/FamilyService.java

@@ -397,7 +397,7 @@ public class FamilyService {
        end.put("color", "#173177");
        json.put("remark", end);
        System.out.println("发送邀请信息:templateId:"+templateId+",openId:"+openId+",url:"+url+",json:"+json);
        weiXinTempMsgSendUtils.sendTemplateMessage(templateId, openId, url, json);
        weiXinTempMsgSendUtils.sendTemplateMessage(templateId, openId, url, json,doctor);
    }
    /**

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/service/template/DoctorFeldsherTemplateService.java

@@ -119,7 +119,7 @@ public class DoctorFeldsherTemplateService extends BaseService {
            String doctorOpenId = doctor.getOpenid();
            businessType = parseBusinessType(businessType);
            JSONObject sendJson = weiXinTempMsgSendUtils.packageTemplate(businessType, remark, content, dateFormat.format(new Date()));
            Boolean flag = weiXinTempMsgSendUtils.sendTemplateMessage(templateId, doctorOpenId, url, sendJson);
            Boolean flag = weiXinTempMsgSendUtils.sendTemplateMessage(templateId, doctorOpenId, url, sendJson,doctor);
            logger.info("send wechat message param : " + doctorOpenId + " =======> " + content);
            logger.info("send wechat message retuen : " + flag + " =======> " + flag);
            logger.info("sendJson: " + sendJson);

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/web/third/gateway/controller/doctor/GcMessageController.java

@@ -67,7 +67,7 @@ public class GcMessageController {
            for (String code : codeArr) {
                try {
                    Patient patient = patientService.findByCode(code);
                    weiXinTempMsgSendUtils.sendTemplateMessage(templateId, patient.getOpenid(), url, new JSONObject(teampolateJson));
                    weiXinTempMsgSendUtils.sendTemplateMessage(templateId, patient.getOpenid(), url, new JSONObject(teampolateJson),null);
                    success++;
                } catch (Exception e) {
                    logger.error("code " + code + "send Template error:" + e.getMessage());
@@ -134,7 +134,7 @@ public class GcMessageController {
                try {
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
                    JSONObject sendJson = weiXinTempMsgSendUtils.packageTemplate("居民咨询请求", "请进入手机APP查看", content, dateFormat.format(new Date()));
                    Boolean flag = weiXinTempMsgSendUtils.sendTemplateMessage(templateId, openId, url, sendJson);
                    Boolean flag = weiXinTempMsgSendUtils.sendTemplateMessage(templateId, openId, url, sendJson,null);
                    logger.info("send wechat message param : " + openId+" =======> "+content);
                    logger.info("send wechat message retuen : " + openId+" =======> "+flag);
                    success++;

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/wechat/util/WeiXinTempMsgSendUtils.java

@@ -1,11 +1,15 @@
package com.yihu.wlyy.wechat.util;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.wechat.WechatPushLog;
import com.yihu.wlyy.repository.wechat.WechatPushLogDao;
import com.yihu.wlyy.util.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -19,6 +23,8 @@ public class WeiXinTempMsgSendUtils {
    WeiXinAccessTokenUtils weiXinAccessTokenUtils;
    @Autowired
    private HttpUtil httpUtil;
    @Autowired
    private WechatPushLogDao wechatPushLogDao;
    // 模板消息发送接口URL
    private static String TEMP_MSG_SEND_URL = "https://api.weixin.qq.com/cgi-bin/message/template" +
@@ -33,7 +39,7 @@ public class WeiXinTempMsgSendUtils {
     * @param data       模板数据
     * @return
     */
    public boolean sendTemplateMessage(String templateId, String toUser, String url, JSONObject data) throws Exception {
    public boolean sendTemplateMessage(String templateId, String toUser, String url, JSONObject data, Doctor doctor) throws Exception {
        // 参数
        JSONObject params = new JSONObject();
        String accessToken = weiXinAccessTokenUtils.getAccessToken();
@@ -57,14 +63,31 @@ public class WeiXinTempMsgSendUtils {
        // 模板数据
        params.put("data", data);
        WechatPushLog log = new WechatPushLog();
        log.setCreateTime(new Date());
        log.setOpenid(toUser);
        if(doctor==null){
            log.setType(92);
        }else {
            log.setType(91);
            log.setName(doctor.getName());
            log.setPatient(doctor.getCode());
        }
        log.setRequest(params.toString());
        // 发送模板消息
        String result = httpUtil.sendPost(TEMP_MSG_SEND_URL + accessToken, params.toString());
        System.out.println("weixinReturn:" + result);
        log.setResponse(result);
        JSONObject jsonResult = new JSONObject(result);
        String returnCode = jsonResult.get("errcode").toString();
        if ("0".equals(returnCode)) {
            log.setStatus(1);
            wechatPushLogDao.save(log);
            return true;
        } else {
            log.setStatus(0);
            wechatPushLogDao.save(log);
            return false;
        }
    }

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

@@ -0,0 +1,11 @@
package com.yihu.wlyy.repository.wechat;
import com.yihu.wlyy.entity.wechat.WechatPushLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2017/10/18.
 */
public interface WechatPushLogDao extends PagingAndSortingRepository<WechatPushLog, Long>, JpaSpecificationExecutor<WechatPushLog> {
}

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

@@ -1,8 +1,10 @@
package com.yihu.wlyy.task;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.entity.wechat.WechatPushLog;
import com.yihu.wlyy.entity.wechat.WechatTemplate;
import com.yihu.wlyy.entity.wechat.WechatTemplateData;
import com.yihu.wlyy.repository.wechat.WechatPushLogDao;
import com.yihu.wlyy.util.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -14,6 +16,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
@@ -56,6 +59,9 @@ public class PushMsgTask {
    @Value("${wechat.message.template_doctor_service}")
    private String template_doctor_service;//服务结果通知
    @Autowired
    private WechatPushLogDao wechatPushLogDao;
    /**
     * 添加一条推送消息
     *
@@ -225,13 +231,27 @@ public class PushMsgTask {
                    logger.error("参数错误！error");
                    return false;
                }
                WechatPushLog log = new WechatPushLog();
                log.setType(type);
                log.setCreateTime(new Date());
                log.setName(name);
                log.setOpenid(openid);
                if(!json.isNull("toUser")){
                    log.setPatient(json.getString("toUser"));
                }
                log.setRequest(json.toString());
                String result = httpUtil.sendPost(token_url, params);
                log.setResponse(result);
                JSONObject jsonResult = new JSONObject(result);
                if (Integer.parseInt(jsonResult.get("errcode").toString()) == 0) {
                    logger.info("微信信息推送成功！success");
                    log.setStatus(1);
                    wechatPushLogDao.save(log);
                    return true;
                } else {
                    logger.error("错误编码：" + jsonResult.get("errcode").toString() + "  错误提示:" + jsonResult.get("errmsg").toString());
                    log.setStatus(0);
                    wechatPushLogDao.save(log);
                    return false;
                }
            } else {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/wechat/WechatPushLogDao.java

@@ -0,0 +1,11 @@
package com.yihu.wlyy.repository.wechat;
import com.yihu.wlyy.entity.wechat.WechatPushLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2017/10/18.
 */
public interface WechatPushLogDao extends PagingAndSortingRepository<WechatPushLog, Long>, JpaSpecificationExecutor<WechatPushLog> {
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -1130,7 +1130,7 @@ public class ConsultTeamService extends ConsultService {
        prescription.setPatientName(p.getName());
        prescription.setSsc(p.getSsc());
        prescription.setReason(reason);
        prescription.setType(PrescriptionLog.PrescriptionLogType.create.getValue());
        prescription.setType(2);
        prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.revieweding.getValue());
        prescription.setConsult(ct.getConsult());
        prescription.setJwPayStatus(0);//处方结算状态，0为未结算，1为结算成功，默认为0

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/task/PushMsgTask.java

@@ -1,8 +1,10 @@
package com.yihu.wlyy.task;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.entity.wechat.WechatPushLog;
import com.yihu.wlyy.entity.wechat.WechatTemplate;
import com.yihu.wlyy.entity.wechat.WechatTemplateData;
import com.yihu.wlyy.repository.wechat.WechatPushLogDao;
import com.yihu.wlyy.util.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -15,6 +17,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
@@ -64,7 +67,8 @@ public class PushMsgTask {
    private String putMesType;
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Autowired
    private WechatPushLogDao wechatPushLogDao;
    /**
     * 添加一条推送消息
@@ -240,12 +244,26 @@ public class PushMsgTask {
                    logger.error("参数错误！error");
                    return false;
                }
                WechatPushLog log = new WechatPushLog();
                log.setType(type);
                log.setCreateTime(new Date());
                log.setName(name);
                log.setOpenid(openid);
                if(!json.isNull("toUser")){
                    log.setPatient(json.getString("toUser"));
                }
                log.setRequest(json.toString());
                String result = httpUtil.sendPost(token_url, params);
                JSONObject jsonResult = new JSONObject(result);
                log.setResponse(result);
                if (Integer.parseInt(jsonResult.get("errcode").toString()) == 0) {
                    logger.info("微信信息推送成功！success");
                    log.setStatus(1);
                    wechatPushLogDao.save(log);
                    return true;
                } else {
                    log.setStatus(0);
                    wechatPushLogDao.save(log);
                    logger.error("错误编码：" + jsonResult.get("errcode").toString() + "  错误提示:" + jsonResult.get("errmsg").toString());
                    return false;
                }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prenatalInspector/ChildImmuneController.java

@@ -0,0 +1,53 @@
//package com.yihu.wlyy.web.patient.prenatalInspector;
//
//import com.alibaba.fastjson.JSONObject;
//import com.yihu.wlyy.web.BaseController;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import io.swagger.annotations.ApiParam;
//import org.springframework.http.MediaType;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestMethod;
//import org.springframework.web.bind.annotation.RequestParam;
//import org.springframework.web.bind.annotation.RestController;
//
///**
// * Created by yeshijie on 2017/10/18.
// */
//@RestController
//@RequestMapping(value = "/patient/immune", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
//@Api(description = "患者端-免疫")
//public class ChildImmuneController extends BaseController{
//
//
//
//    @ApiOperation("获取儿童信息")
//    @RequestMapping(value = "findChildInfo", method = RequestMethod.GET)
//    public String findChildInfo(@ApiParam(name = "pregnancyNo", value = "产检号", defaultValue = "")
//                                                @RequestParam(value = "pregnancyNo", required = true) String pregnancyNo){
//        try {
//            JSONObject jsonObject = null;
//            return write(200, "查询成功！", "data", jsonObject);
//        }catch (Exception e){
//            error(e);
//            return error(-1,"查询失败");
//        }
//    }
//
//    @ApiOperation("绑定儿童关联")
//    @RequestMapping(value = "findChildInfo", method = RequestMethod.GET)
//    public String bindChildInfo(@ApiParam(name = "pregnancyNo", value = "产检号", defaultValue = "")
//                                @RequestParam(value = "pregnancyNo", required = true) String pregnancyNo){
//        try {
//            JSONObject jsonObject = null;
//
//
//
//            return write(200, "查询成功！", "data", jsonObject);
//        }catch (Exception e){
//            error(e);
//            return error(-1,"查询失败");
//        }
//    }
//
//}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prenatalInspector/PrenatalInspectorContoller.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(value = "/patient/prenatalnspector", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-产检")
public class PrenatalInspectorContoller extends BaseController{
public class PrenatalInspectorController extends BaseController{
    @Autowired
    private PrenatalInspectorPreCardService preCardService;