代码修改

common/common-entity/src/main/java/com/yihu/mm/entity/patient/Report.java

@@ -0,0 +1,88 @@
package com.yihu.mm.entity.patient;
/**
 * 非数据库字段,用于越人接口返回转换
 */
public class Report {
    private String cc_id;//咨询结论编号
    private String ct_id;//咨询编号
    private String cl_id;//结论编号
    private String cc_last;//最终结论
    private String cl_template;//显示模板
    private String cl_type;//分类
    private String cl_sort;//结论排序权重
    private String cl_condition;
    public String getCc_id() {
        return cc_id;
    }
    public void setCc_id(String cc_id) {
        this.cc_id = cc_id;
    }
    public String getCt_id() {
        return ct_id;
    }
    public void setCt_id(String ct_id) {
        this.ct_id = ct_id;
    }
    public String getCl_id() {
        return cl_id;
    }
    public void setCl_id(String cl_id) {
        this.cl_id = cl_id;
    }
    public String getCc_last() {
        return cc_last;
    }
    public void setCc_last(String cc_last) {
        this.cc_last = cc_last;
    }
    public String getCl_template() {
        return cl_template;
    }
    public void setCl_template(String cl_template) {
        this.cl_template = cl_template;
    }
    public String getCl_type() {
        return cl_type;
    }
    public void setCl_type(String cl_type) {
        this.cl_type = cl_type;
    }
    public String getCl_sort() {
        return cl_sort;
    }
    public void setCl_sort(String cl_sort) {
        this.cl_sort = cl_sort;
    }
    public String getCl_condition() {
        return cl_condition;
    }
    public void setCl_condition(String cl_condition) {
        this.cl_condition = cl_condition;
    }
}

common/common-entity/src/main/java/com/yihu/mm/entity/patient/ReportDetail.java

@@ -0,0 +1,42 @@
package com.yihu.mm.entity.patient;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 非数据库字段,用于越人接口返回数据的转换
 */
public class ReportDetail {
    private List<Map<String,Object>> conclusion = new ArrayList<>();
    private List<Map<String,Object>> nature = new ArrayList<>();
    private Map<String,Object> userinfo = new HashMap<>();
    public List<Map<String, Object>> getConclusion() {
        return conclusion;
    }
    public void setConclusion(List<Map<String, Object>> conclusion) {
        this.conclusion = conclusion;
    }
    public List<Map<String, Object>> getNature() {
        return nature;
    }
    public void setNature(List<Map<String, Object>> nature) {
        this.nature = nature;
    }
    public Map<String, Object> getUserinfo() {
        return userinfo;
    }
    public void setUserinfo(Map<String, Object> userinfo) {
        this.userinfo = userinfo;
    }
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/gateway/GcClientDetails.java

@@ -0,0 +1,165 @@
package com.yihu.wlyy.entity.gateway;
import com.yihu.wlyy.entity.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * GtClientDetails entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "gc_client_details")
public class GcClientDetails extends IdEntity implements java.io.Serializable {
    // Fields
    private String appId;
    private String appSecret;
    private String appUri;
    private Date creatieTime;
    private String creatieUser;
    private String createUserName;
    private Date updateTime;
    private String updateUser;
    private String updateUserName;
    private String remark;
    private Integer del;
    // Constructors
    /**
     * default constructor
     */
    public GcClientDetails() {
    }
    /**
     * full constructor
     */
    public GcClientDetails(String appId, String appSecret, String appUri,
                           Timestamp creatieTime, String creatieUser, String createUserName,
                           Timestamp updateTime, String updateUser, String updateUserName,
                           String remark, Integer del) {
        this.appId = appId;
        this.appSecret = appSecret;
        this.appUri = appUri;
        this.creatieTime = creatieTime;
        this.creatieUser = creatieUser;
        this.createUserName = createUserName;
        this.updateTime = updateTime;
        this.updateUser = updateUser;
        this.updateUserName = updateUserName;
        this.remark = remark;
        this.del = del;
    }
    @Column(name = "app_id", length = 100)
    public String getAppId() {
        return this.appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    @Column(name = "app_secret", length = 100)
    public String getAppSecret() {
        return this.appSecret;
    }
    public void setAppSecret(String appSecret) {
        this.appSecret = appSecret;
    }
    @Column(name = "app_uri", length = 256)
    public String getAppUri() {
        return this.appUri;
    }
    public void setAppUri(String appUri) {
        this.appUri = appUri;
    }
    @Column(name = "creatie_time", length = 0)
    public Date getCreatieTime() {
        return this.creatieTime;
    }
    public void setCreatieTime(Date creatieTime) {
        this.creatieTime = creatieTime;
    }
    @Column(name = "creatie_user", length = 100)
    public String getCreatieUser() {
        return this.creatieUser;
    }
    public void setCreatieUser(String creatieUser) {
        this.creatieUser = creatieUser;
    }
    @Column(name = "create_user_name", length = 20)
    public String getCreateUserName() {
        return this.createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @Column(name = "update_time", length = 0)
    public Date getUpdateTime() {
        return this.updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "update_user")
    public String getUpdateUser() {
        return this.updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @Column(name = "update_user_name", length = 100)
    public String getUpdateUserName() {
        return this.updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    @Column(name = "remark", length = 20)
    public String getRemark() {
        return this.remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "del")
    public Integer getDel() {
        return this.del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/gateway/GcHttpLog.java

@@ -0,0 +1,109 @@
package com.yihu.wlyy.entity.gateway;
import com.yihu.wlyy.entity.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * GcHttpLog entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "gc_http_log")
public class GcHttpLog extends IdEntity implements java.io.Serializable {
    // Fields
    private String token;
    private String ip;
    private String method;
    private String input;
    private String output;
    private Date createTime;
    // Constructors
    /**
     * default constructor
     */
    public GcHttpLog() {
    }
    /**
     * full constructor
     */
    public GcHttpLog(String token, String ip, String method, String input,
                     String output, Timestamp createTime) {
        this.token = token;
        this.ip = ip;
        this.method = method;
        this.input = input;
        this.output = output;
        this.createTime = createTime;
    }
    @Column(name = "token")
    public String getToken() {
        return this.token;
    }
    public void setToken(String token) {
        this.token = token;
    }
    @Column(name = "ip", length = 100)
    public String getIp() {
        return this.ip;
    }
    public void setIp(String ip) {
        this.ip = ip;
    }
    @Column(name = "method")
    public String getMethod() {
        return this.method;
    }
    public void setMethod(String method) {
        this.method = method;
    }
    @Column(name = "input")
    public String getInput() {
        return this.input;
    }
    public void setInput(String input) {
        this.input = input;
    }
    @Column(name = "output")
    public String getOutput() {
        return this.output;
    }
    public void setOutput(String output) {
        this.output = output;
    }
    @Column(name = "create_time")
    public Date getCreateTime() {
        return this.createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/gateway/GcToken.java

@@ -0,0 +1,100 @@
package com.yihu.wlyy.entity.gateway;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * GtToken entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "gt_token")
public class GcToken implements java.io.Serializable {
	// Fields
	private Integer id;
	private String appid;
	private String token;
	private Timestamp createTime;
	private Timestamp outTime;
	private Integer del;
	// Constructors
	/** default constructor */
	public GcToken() {
	}
	/** full constructor */
	public GcToken(String appid, String token, Timestamp createTime,
			Timestamp outTime, Integer del) {
		this.appid = appid;
		this.token = token;
		this.createTime = createTime;
		this.outTime = outTime;
		this.del = del;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "appid", length = 200)
	public String getAppid() {
		return this.appid;
	}
	public void setAppid(String appid) {
		this.appid = appid;
	}
	@Column(name = "token")
	public String getToken() {
		return this.token;
	}
	public void setToken(String token) {
		this.token = token;
	}
	@Column(name = "create_time", length = 0)
	public Timestamp getCreateTime() {
		return this.createTime;
	}
	public void setCreateTime(Timestamp createTime) {
		this.createTime = createTime;
	}
	@Column(name = "out_time", length = 0)
	public Timestamp getOutTime() {
		return this.outTime;
	}
	public void setOutTime(Timestamp outTime) {
		this.outTime = outTime;
	}
	@Column(name = "del")
	public Integer getDel() {
		return this.del;
	}
	public void setDel(Integer del) {
		this.del = del;
	}
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/gateway/GcTokenLog.java

@@ -0,0 +1,101 @@
package com.yihu.wlyy.entity.gateway;
import com.yihu.wlyy.entity.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * GcTokenLog entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "gc_token_log")
public class GcTokenLog extends IdEntity implements java.io.Serializable {
	// Fields
	private String ip;
	private String appIp;
	private Integer tokenId;
	private Integer flag;
	private String message;
	private Date createTime;
	// Constructors
	/** default constructor */
	public GcTokenLog() {
	}
	/** full constructor */
	public GcTokenLog(String ip, String appIp, Integer tokenId, Integer flag,
			String message, Timestamp createTime) {
		this.ip = ip;
		this.appIp = appIp;
		this.tokenId = tokenId;
		this.flag = flag;
		this.message = message;
		this.createTime = createTime;
	}
	@Column(name = "ip")
	public String getIp() {
		return this.ip;
	}
	public void setIp(String ip) {
		this.ip = ip;
	}
	@Column(name = "app_ip")
	public String getAppIp() {
		return this.appIp;
	}
	public void setAppIp(String appIp) {
		this.appIp = appIp;
	}
	@Column(name = "token_id")
	public Integer getTokenId() {
		return this.tokenId;
	}
	public void setTokenId(Integer tokenId) {
		this.tokenId = tokenId;
	}
	@Column(name = "flag")
	public Integer getFlag() {
		return this.flag;
	}
	public void setFlag(Integer flag) {
		this.flag = flag;
	}
	@Column(name = "message", length = 2000)
	public String getMessage() {
		return this.message;
	}
	public void setMessage(String message) {
		this.message = message;
	}
	@Column(name = "create_time", length = 0)
	public Date getCreateTime() {
		return this.createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/message/Message.java

@@ -46,7 +46,7 @@ public class Message extends IdEntity {
	private String tzType;//体征类别
	private String tzCode;//体征code
	private Integer sex;//患者性别
	private String relationCode;//业务关联code，type=6时为咨询code,type=7时为续方code
	private String relationCode;//业务关联code，type=6时为咨询code,type=7时为续方code type=8时为续方表code
	private String prescriptionStatus;//type=6续方审核状态 0待审核，1审核通过，2审核失败|type=7续方状态 0待取药，1已取药
	public String getCode() {

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/controller/medicine/PhysicalExaminationController.java

@@ -1,24 +1,30 @@
package com.yihu.mm.controller.medicine;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.mm.controller.BaseController;
import com.yihu.mm.entity.patient.ExamReport;
import com.yihu.mm.entity.patient.PatientExam;
import com.yihu.mm.entity.patient.Report;
import com.yihu.mm.entity.patient.ReportDetail;
import com.yihu.mm.entity.questionnaire.MedicineAnswerLog;
import com.yihu.mm.service.*;
import com.yihu.mm.util.JSONUtil;
import com.yihu.wlyy.entity.patient.Patient;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = "/medicine/physicalExamination")
@@ -98,7 +104,11 @@ public class PhysicalExaminationController extends BaseController {
        //查找居民是否已经答过该试题
        MedicineAnswerLog answer = medicineAnswerLogService.findAnswer(patientCode, examCode, _pb_id,ct_id);
        jsonQuestion.put("answer",(answer==null?"":answer.getProblems()));
        String answerStr="";
        if(answer!=null){
            answerStr = answer.getProblems().replace("\"","\\\"");
        }
        jsonQuestion.put("answer",answerStr);
        return jsonQuestion.toString();
    }
@@ -108,10 +118,9 @@ public class PhysicalExaminationController extends BaseController {
    @ResponseBody
    public String handleExam(@ApiParam(name = "ct_id", value = "咨询编号", required = true)@RequestParam(required = true, name = "ct_id") String ct_id,
                               @ApiParam(name = "pb_id", value = "问卷编号,第一题为0", required = true)@RequestParam(required = true, name = "pb_id") String pb_id,
                                @ApiParam(name = "i_multiselect", value = "试题类型(0单选 ,1多选)", required = true)@RequestParam(required = true, name = "i_multiselect") String i_multiselect,
                                @ApiParam(name = "type", value = "试题类型(0单选 ,1多选)", required = true)@RequestParam(required = true, name = "type") String type,
                               @ApiParam(name = "dc_answer", value = "问题答案", required = true)@RequestParam(required = true, name = "dc_answer") String dc_answer,
                             @ApiParam(name = "patientCode", value = "居民code", required = true)@RequestParam(required = true, name = "patientCode") String patientCode,
                             @ApiParam(name = "isLast", value = "是否是最后一题(0否 ,1是)", required = true)@RequestParam(required = false, name = "isLast") String isLast){
                             @ApiParam(name = "patientCode", value = "居民code", required = true)@RequestParam(required = true, name = "patientCode") String patientCode){
        PatientExam patientExam = patientExamService.findByPatientAndTpId(patientCode, examCode,ct_id);
        String tpName = patientExam.getTpName();
        String result = physicalExaminationService.handleExam(examCode, pb_id, dc_answer, ct_id);
@@ -127,34 +136,60 @@ public class PhysicalExaminationController extends BaseController {
            answer.setTpName(tpName);
            answer.setCtId(ct_id);
        }
        answer.setPbType(String.valueOf(i_multiselect));
        answer.setPbType(String.valueOf(type));
        answer.setProblems(dc_answer);
        medicineAnswerLogService.save(answer);
        return result;
    }
    @ApiOperation(value = "四诊资料采集")
    @RequestMapping(value = "/dillphoneimgdata",produces="application/json;charset=UTF-8")
    @RequestMapping(value = "/dillphoneimgdata", method = RequestMethod.POST,produces="application/json;charset=UTF-8")
    @ResponseBody
    public String dillphoneimgdata(@ApiParam(name = "at_id", value = "文件id", required = true)@RequestParam(required = true, name = "at_id") String at_id,
                             @ApiParam(name = "answer", value = "问题答案,文件名称", required = true)@RequestParam(required = true, name = "answer") String answer,
    public String dillphoneimgdata(@RequestParam MultipartFile file,
                              @ApiParam(name = "type", value = "1.脸型  2.舌像  3.声音", required = true)@RequestParam(required = true, name = "type") String type,
                             @ApiParam(name = "ct_id", value = "咨询编号", required = true)@RequestParam(required = true, name = "ct_id") String ct_id){
        String result = physicalExaminationService.dillphoneimgdata(at_id, answer, type, ct_id);
        String uploadAttachment = physicalExaminationService.uploadAttachment(file);
        String at_id = null;
        String at_realname=null;
        JSONObject uploadResult = new JSONObject(uploadAttachment);
        String status = uploadResult.get("status").toString();
        if("200".equals(status)){
            JSONObject recordset = uploadResult.getJSONObject("recordset");
            at_id =  recordset.get("at_id").toString();
            at_realname = (String) recordset.get("at_realname");
        }else{
            return write(500,"提交失败","exception",uploadResult.get("status").toString());
        }
        String result = physicalExaminationService.dillphoneimgdata(at_id, at_realname, type, ct_id);
        return result;
    }
    @ApiOperation(value = "查看报告单")
    @RequestMapping(value = "/findconconhealth",produces="application/json;charset=UTF-8")
    @RequestMapping(value = "/showDetail",produces="application/json;charset=UTF-8")
    @ResponseBody
    public String showDetail(@ApiParam(name = "patientCode", value = "居民code", required = false)@RequestParam(required = true, name = "patientCode") String patientCode,
            @ApiParam(name = "ct_id", value = "咨询编号", required = false)@RequestParam(required = false, name = "ct_id") String ct_id){
        ExamReport examReport = examReportService.showDetail(patientCode, ct_id);
        Map<String,Object> respon = new HashMap<String,Object>();
        if(null!=examReport){
            String report = examReport.getReport();
            String reportDetail = examReport.getReportDetail();
            List<Report> reports = null;
            ReportDetail reportDetail1 = null;
            ObjectMapper objm = new ObjectMapper();
            JavaType javaType = objm.getTypeFactory().constructParametricType(List.class, Report.class);
            try {
                reports=(List<Report>)objm.readValue(report,javaType);
                reportDetail1 = (ReportDetail) JSONUtil.JSONToObj(reportDetail, ReportDetail.class);
            } catch (Exception e) {
                e.printStackTrace();
            }
            respon.put("report",reports);
            respon.put("reportDetail",reportDetail1);
            return write(200,"查询成功","recordset",respon);
        }
        return write(200,"查询成功","recordset",examReport);
        return write(-200,"未查询到数据");
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/service/PhysicalExaminationService.java

@@ -7,8 +7,15 @@ import com.yihu.wlyy.entity.patient.Patient;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.FileSystemResource;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -172,4 +179,29 @@ public class PhysicalExaminationService {
        return examReport;
    }
    //查找试卷
    public String uploadAttachment(MultipartFile file) {
        MultiValueMap<String, Object> param = new LinkedMultiValueMap<>();
        String fileName = file.getOriginalFilename();
        String filePath =Class.class.getClass().getResource("/").getPath() + "temp/" + System.currentTimeMillis() + fileName;
        File dest = new File(filePath);
        if (!dest.getParentFile().exists()) {
            dest.getParentFile().mkdirs();
        }
        try {
            file.transferTo(dest);
            RestTemplate rest = new RestTemplate();
            FileSystemResource resource = new FileSystemResource(filePath);
            param.add("file", resource);
            String postStr = rest.postForObject(yuerenApi+"/uploadattachment" , param, String.class);
            if (dest.exists() && dest.isFile()) {
                dest.delete();
            }
            return postStr;
        } catch (IOException e) {
            e.printStackTrace();
        }
        return "{\"status\":500,\"exception\":\"上传文件出错\"}";
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/family/FamilyMemberService.java

@@ -135,18 +135,15 @@ public class FamilyMemberService extends BaseService {
        SignFamily sign = contractService.findSignByPatient(p.getCode());
        boolean ssSign = false;
        boolean jtSign = false;
        String doctor = null;
        String doctorName = null;
        map.put("statusName","未签约");
        if (sign != null) {
            doctor = sign.getDoctor();
            doctorName = sign.getDoctorName();
            map.put("statusName","已签约");
            String doctorCode = sign.getDoctor();
            map.put("doctor",doctorCode);
            map.put("doctorName",sign.getDoctorName());
            Doctor doctor = hosDoctorService.getDoctorByCode(doctorCode);
            map.put("doctorMobile",doctor.getMobile());
        }
        map.put("doctor",doctor);
        map.put("doctorName",doctorName);
        Doctor _doctor = hosDoctorService.getDoctorByCode(doctor);
        map.put("doctorMobile",_doctor.getMobile());
        map.put("code", p.getCode());
        map.put("name", p.getName());
        map.put("sex", p.getSex());

patient-co-service/wlyy_service/src/main/resources/system.properties

@@ -5,6 +5,8 @@ gateway_licence = 5YGl5bq45LmL7Lev
gateway_public_key = PublicKeyTest.key
jw_hospital = 350211B1013
jw_licence = 5YGl5bq45LmL7Lev
ca_url = http://117.29.183.114:8081/XMCAService?wsdl
ca_namespace = http://platfomservice.xmca.com/
##基卫服务
#guahao_url =  http://10.95.18.10/urp.service/urp.open.service/ReservationPulic.asmx
@@ -13,6 +15,4 @@ jw_licence = 5YGl5bq45LmL7Lev
#gateway_licence = 5YGl5bq45LmL7Lev
#gateway_public_key = PublicGov.key
#jw_hospital = 350211B1004
#jw_licence = 5YGl5bq35LmL6LevMzUwMjExQjEwMDQ=
ca_url = http://117.29.183.114:8081/XMCAService?wsdl
ca_namespace = http://platfomservice.xmca.com/
#jw_licence = 5YGl5bq35LmL6LevMzUwMjExQjEwMDQ=

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/MvcConfig.java

@@ -1,6 +1,7 @@
package com.yihu.wlyy.config;
import com.yihu.wlyy.interceptors.DoctorInterceptor;
import com.yihu.wlyy.interceptors.GateWayInterceptor;
import com.yihu.wlyy.interceptors.PatientInterceptor;
import com.yihu.wlyy.interceptors.UserInterceptor;
import org.slf4j.Logger;
@@ -25,6 +26,8 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
    private PatientInterceptor patientInterceptor;
    @Autowired
    private UserInterceptor userInterceptor;
    @Autowired
    private GateWayInterceptor gateWayInterceptor;
    @Override
    public void addInterceptors(InterceptorRegistry registry) {
@@ -34,6 +37,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
        registry.addInterceptor(doctorInterceptor).addPathPatterns("/doctor/**", "/statistics/province/**", "/statistics/**");
        registry.addInterceptor(patientInterceptor).addPathPatterns("/patient/**");
        registry.addInterceptor(userInterceptor).addPathPatterns("/user/**");
        registry.addInterceptor(gateWayInterceptor).addPathPatterns("/wlyygc/**");
        super.addInterceptors(registry);
        logger.info("init doctorInterceptor,patientInterceptor");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/SwaggerConfig.java

@@ -3,12 +3,18 @@ package com.yihu.wlyy.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.request.async.DeferredResult;
import springfox.documentation.builders.ParameterBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Parameter;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.ArrayList;
import java.util.List;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@@ -19,9 +25,40 @@ public class SwaggerConfig {
    private static final String Doctor_API = "doctor";
    private static final String Patient_API = "patient";
    private static final String Other_API = "other";
    private static final String GateWay_API = "gateway";
     final String userAgent="{\"id\":用户id,\"uid\":\"用户code\",\"openid\":\"openid\",\"token\":\"token表\",\"lastUid\":\"\",\"platform\":\"1患者APP，2医生APP，3患者微信公众号\"}";
    final String userAgentJson="{\"id\":int,\"uid\":string,\"openid\":string,\"token\":string,\"lastUid\":string,\"platform\":int}";
    @Bean
    public Docket gatewayAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(GateWay_API)
                .genericModelSubstitutes(DeferredResult.class)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(true)
                .pathMapping("/")
                .select()
                .paths(or(regex("/wlyygc/.*")))
                .build()
                .apiInfo(gatewayApiInfo());
    }
    private ApiInfo gatewayApiInfo() {
        ApiInfo apiInfo = new ApiInfo("三师平台API",
                "对外部应用提供功能与数据接口。",
                "1.0",
                "No terms of service",
                "admin@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
    @Bean
    public Docket publicAPI() {
        List<Parameter> pars = addUseragent();
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Doctor_API)
                .genericModelSubstitutes(DeferredResult.class)
@@ -32,9 +69,18 @@ public class SwaggerConfig {
                .paths(or(regex("/doctor/.*"),
                        regex("/PC/.*")))
                .build()
                .globalOperationParameters(pars)
                .apiInfo(publicApiInfo());
    }
    private List<Parameter> addUseragent() {
        ParameterBuilder tokenPar = new ParameterBuilder();
        List<Parameter> pars = new ArrayList<Parameter>();
        tokenPar.name("userAgent").description(userAgentJson).modelRef(new ModelRef("string")).parameterType("header").required(false).defaultValue(userAgent).build();
        pars.add(tokenPar.build());
        return pars;
    }
    private ApiInfo publicApiInfo() {
        ApiInfo apiInfo = new ApiInfo("三师平台API",
                "向PC端，微信、App等应用提供功能与数据接口。",
@@ -50,6 +96,7 @@ public class SwaggerConfig {
    @Bean
    public Docket patientAPI() {
        List<Parameter> pars = addUseragent();
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Patient_API)
                .genericModelSubstitutes(DeferredResult.class)
@@ -59,6 +106,7 @@ public class SwaggerConfig {
                .select()
                .paths(PathSelectors.regex("/patient/.*"))
                .build()
                .globalOperationParameters(pars)
                .apiInfo(patientApiInfo());
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/interceptors/GateWayInterceptor.java

@@ -0,0 +1,43 @@
package com.yihu.wlyy.interceptors;
/**
 * Created by chenweida on 2017/8/17.
 */
import com.yihu.wlyy.repository.gateway.GcHttpLogDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
 * 对外的请求拦截
 */
@Component
public class GateWayInterceptor extends BaseInterceptor {
    private Logger logger = LoggerFactory.getLogger(GateWayInterceptor.class);
    @Autowired
    private GcHttpLogDao httpLogDao;
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        return false;
    }
    @Override
    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
        HandlerMethod handlerMethod = (HandlerMethod) handler;
    }
    @Override
    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/gateway/GcClientDetailsDao.java

@@ -0,0 +1,11 @@
package com.yihu.wlyy.repository.gateway;
import com.yihu.wlyy.entity.gateway.GcClientDetails;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/8/17.
 */
public interface GcClientDetailsDao extends PagingAndSortingRepository<GcClientDetails, Long>, JpaSpecificationExecutor<GcClientDetails> {
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/gateway/GcHttpLogDao.java

@@ -0,0 +1,12 @@
package com.yihu.wlyy.repository.gateway;
import com.yihu.wlyy.entity.gateway.GcHttpLog;
import com.yihu.wlyy.entity.httpLog.HttpLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/8/17.
 */
public interface GcHttpLogDao extends PagingAndSortingRepository<GcHttpLog, Long>, JpaSpecificationExecutor<GcHttpLog> {
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/gateway/GcTokenLogDao.java

@@ -0,0 +1,11 @@
package com.yihu.wlyy.repository.gateway;
import com.yihu.wlyy.entity.gateway.GcTokenLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/8/17.
 */
public interface GcTokenLogDao extends PagingAndSortingRepository<GcTokenLog, Long>, JpaSpecificationExecutor<GcTokenLog> {
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/hospital/HospitalService.java

@@ -85,16 +85,18 @@ public class HospitalService extends BaseService {
     * @param province
     * @param city
     * @param town
     * @param key
     * @param hospitalName
     * @param page
     * @param pagesize
     * @return
     */
    public List<Hospital> getHospitals(int type, String province, String city, String town, String key, int page, int pagesize) {
        String sql = "select * from dm_hospital where exists (select * from wlyy_doctor where wlyy_doctor.hospital = dm_hospital.code) and level = ? ";
    public List<Hospital> getHospitals(Integer type, String province, String city, String town, String hospitalName,String hospitalId, int page, int pagesize) {
        String sql = "select * from dm_hospital where exists (select * from wlyy_doctor where wlyy_doctor.hospital = dm_hospital.code) ";
        List<Object> args = new ArrayList<>();
        args.add(type);
        if (type != null ) {
            sql += " and level = ? ";
            args.add(type);
        }
        if (StringUtils.isNotEmpty(province)) {
            sql += " and province = ? ";
@@ -108,11 +110,14 @@ public class HospitalService extends BaseService {
            sql += " and town = ? ";
            args.add(town);
        }
        if (StringUtils.isNotEmpty(key)) {
        if (StringUtils.isNotEmpty(hospitalName)) {
            sql += " and name like ? ";
            args.add("%" + key + "%");
            args.add("%" + hospitalName + "%");
        }
        if (StringUtils.isNotEmpty(hospitalId)) {
            sql += " and code = ? ";
            args.add(hospitalId);
        }
        sql += " limit " + (page * pagesize) + "," + pagesize;
        List<Hospital> hosList = jdbcTemplate.query(sql, args.toArray(), new BeanPropertyRowMapper(Hospital.class));

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PatientPrescriptionPayService.java

@@ -127,6 +127,7 @@ public class PatientPrescriptionPayService extends BaseService {
     * @return
     */
    public JSONObject dispatch(String prescriptionCode, String orgCode) throws Exception {
        LOGGER.info("========================>" + "prescriptionCode "+prescriptionCode+" orgCode" +orgCode);
        JSONObject result = new JSONObject();
        List manage = new ArrayList();
        List types = new ArrayList();
@@ -252,6 +253,7 @@ public class PatientPrescriptionPayService extends BaseService {
     * @return
     */
    public Map recipeReturnUrl(HttpServletRequest request, HttpServletResponse response, String accessToken) throws Exception {
        LOGGER.debug("=================================> "+"start");
        Map resultMap = new HashMap();
        Prescription prescription = null;
        int flag = 0;
@@ -350,6 +352,7 @@ public class PatientPrescriptionPayService extends BaseService {
            String billNo = "201708111044012018301";//待结算费用单据号
            String insuranceAmount = "1542";//医保支付金额
            String outChargeNo = request.getParameter("outChargeNo");//接入应用业务流水号
            LOGGER.debug("=================================> "+outChargeNo);
            String selfPayAmount = "0";//自付金额
            String tradeStatus = "0";//交易状态
@@ -376,7 +379,7 @@ public class PatientPrescriptionPayService extends BaseService {
            String exceedAmount = "0";//超封顶线金额
            String accountBalance = "284125";//个人账户余额
            String healthBalance = "7133";//健康账户余额
            LOGGER.debug("=================================> "+"111111111111111111111");
            prescriptionPay.setBillNo(billNo);//待结算费用单据号
            prescriptionPay.setInsuranceAmount(Integer.parseInt(insuranceAmount));//医保支付金额
            prescriptionPay.setSelfPayAmount(Integer.parseInt(selfPayAmount));//自付金额
@@ -403,7 +406,7 @@ public class PatientPrescriptionPayService extends BaseService {
            prescriptionPay.setExceedAmount(Integer.parseInt(exceedAmount));//超封顶线金额
            prescriptionPay.setAccountBalance(Integer.parseInt(accountBalance));//个人账户余额
            prescriptionPay.setHealthBalance(Integer.parseInt(healthBalance));//健康账户余额
            LOGGER.debug("=================================> "+"2222222222222222222222");
            //        保存数据库更改记录
            payDao.save(prescriptionPay);
@@ -413,6 +416,7 @@ public class PatientPrescriptionPayService extends BaseService {
            prescription = prescriptionDao.findByCode(prescriptionCode);
            PrescriptionExpressage expressage = expressageDao.findByPrescriptionPay(prescriptionCode);
            if ("0".equals(tradeStatus)) {
                LOGGER.debug("=================================> "+"333333333333333333333333333");
                //支付成功返回续方code给前端
                resultMap.put("prescriptionCode",prescriptionCode);
                prescriptionPay.setTradeStatus("1");//交易状态 成功1 失败0
@@ -430,11 +434,12 @@ public class PatientPrescriptionPayService extends BaseService {
                    int type = message.getType();
                    String title = message.getTitle();
                    String content = message.getContent();
                    pushMsgTask.put(receiver, "3", title, content, "");
                    pushMsgTask.put(receiver, "8", title, content, "");
                    message.setOver("1");//操作结束
                    message.setState(1);//已发送
                    message.setCzrq(new Date());
                    messageDao.save(message);
                    LOGGER.debug("=================================> "+"4444444444444444444444444");
                }
                //支付成功发起结算
                jwPrescriptionService.executeSickSettle(prescriptionCode);
@@ -647,6 +652,12 @@ public class PatientPrescriptionPayService extends BaseService {
     */
    @Transactional
    public Map charge(int type, String addressJson, String orgCode, String prescriptionCode, int totalAmount, String people, String accessToken, String returnUrl) throws Exception {
        LOGGER.info("=================> ");
        LOGGER.info("type "+type);
        LOGGER.info("addressJson "+addressJson);
        LOGGER.info("orgCode "+orgCode);
        LOGGER.info("prescriptionCode "+prescriptionCode);
        LOGGER.info("people "+people);
        Map resultMap = new HashMap();
        //获取机构映射
        HospitalMapping hos = mappingDao.findByCode(orgCode);
@@ -802,9 +813,9 @@ public class PatientPrescriptionPayService extends BaseService {
                message.setSenderName("SYSTEM");//发送者
                message.setTitle("新增系统消息");
                SimpleDateFormat format = new SimpleDateFormat("MM月dd日");
                String content = format.format(new Date()) + "新增1个签约居民待分配健管师，目前共" + amount + "人待处理";
                String content = format.format(new Date()) + "新增1个续方订单待分配配送员，目前共" + amount + "人待处理";
                message.setContent(content);
                message.setType(3);//分配健管师
                message.setType(8);//分配健管师
                message.setPlatform(2);//消息平台，1微信端/患者端，2医生APP端
                message.setState(0);//消息状态，1已发送，0待发送，-1发送失败
                message.setRead(1);//查看状态，1未读，0已读
@@ -961,6 +972,7 @@ public class PatientPrescriptionPayService extends BaseService {
        }
        resultMap.put("outChargeNo", uuid);
        resultMap.put("payUrl", result);
        resultMap.put("status", "200");
        return resultMap;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionDispensaryCodeService.java

@@ -1,14 +1,9 @@
package com.yihu.wlyy.service.app.prescription;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.wlyy.entity.patient.prescription.Prescription;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionDispensaryCode;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionInfo;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionLog;
import com.yihu.wlyy.entity.patient.prescription.*;
import com.yihu.wlyy.repository.message.MessageDao;
import com.yihu.wlyy.repository.prescription.PrescriptionDao;
import com.yihu.wlyy.repository.prescription.PrescriptionDispensaryCodeDao;
import com.yihu.wlyy.repository.prescription.PrescriptionInfoDao;
import com.yihu.wlyy.repository.prescription.*;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.util.HttpUtil;
import com.yihu.wlyy.util.QrcodeUtil;
@@ -44,6 +39,12 @@ public class PrescriptionDispensaryCodeService extends BaseService {
    private PrescriptionDao prescriptionDao;
    @Autowired
    private MessageDao messageDao;
    @Autowired
    private PrescriptionLogDao prescriptionLogDao;
    @Autowired
    private PrescriptionExpressageLogDao prescriptionExpressageLogDao;
    @Autowired
    private PrescriptionExpressageService prescriptionExpressageService;
    private static Object obj = new Object();
    private static Object obj2 = new Object();
@@ -233,14 +234,11 @@ public class PrescriptionDispensaryCodeService extends BaseService {
    }
    @Transactional
    public PrescriptionDispensaryCode scanQrcode(String code) throws Exception{
    public PrescriptionDispensaryCode scanQrcode(String code,String userCode) throws Exception{
        PrescriptionDispensaryCode prescriptionDispensaryCode = prescriptionDispensaryCodeDao.findByCodeAndIsUse(code,0);
        if(prescriptionDispensaryCode!=null){
            prescriptionDispensaryCode.setIsUse(1);
            prescriptionDispensaryCodeDao.save(prescriptionDispensaryCode);
        if(prescriptionDispensaryCode!=null){
            Prescription prescription = prescriptionDao.findByCode(prescriptionDispensaryCode.getPrescriptionCode());
            if(prescription.getDispensaryType()==3){
                //健管师配送
@@ -248,8 +246,17 @@ public class PrescriptionDispensaryCodeService extends BaseService {
                messageDao.updatePreScriptionMessage(prescription.getCode(), "1", 7);
            }
        }else{
            throw new Exception("二维码输入错误或者已过期！");
            throw new Exception("取药码错误！");
        }
        Integer status =  prescriptionExpressageService.expressage(code, userCode);
        if (status == -1) {
            throw new Exception("取药码错误！");
        } else if (status == -2) {
            throw new Exception("编码已使用！");
        } else if (status == -3) {
            throw new Exception("编码类型错误！");
        }
        return prescriptionDispensaryCode;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -190,7 +190,7 @@ public class PrescriptionInfoService extends BaseService {
                params.add(patient);
                //查询已经审核通过的,否则查询所有
                if ("2".equals(type)) {
                    sqlBuffer.append(" AND p.status >=10 ");
                    sqlBuffer.append(" AND p.status >="+PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue());
                }
                if (StringUtils.isNotBlank(startDate)) {
                    sqlBuffer.append(" AND p.create_time >= ?");
@@ -211,6 +211,13 @@ public class PrescriptionInfoService extends BaseService {
                    String code = (String) map.get("code");
                    map.put("patient", p.getCode());
                    map.put("patientName", p.getName());
                    StringBuffer isAdjustSql = new StringBuffer("SELECT a.id FROM wlyy_prescription_adjust a WHERE a.prescription_code = ? ");
                    List<Map<String,Object>> adjusts = jdbcTemplate.queryForList(isAdjustSql.toString(),new Object[]{code});
                    if(adjusts!=null&&adjusts.size()>0){
                        map.put("isAdjust", "1");
                    }else{
                        map.put("isAdjust", "0");
                    }
                    map.put("prescriptionInfo", prescriptionDiagnosisService.getPrescriptionInfo(code));
                    map.put("prescriptionDt", prescriptionDiagnosisService.getPrescriptionDiagnosis(code));
                }
@@ -307,8 +314,8 @@ public class PrescriptionInfoService extends BaseService {
        }
        if (prescription != null && prescription.getStatus() == PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue()) {
            Long s = (prescription.getCreateTime().getTime() - new Date().getTime()) / 1000;
        if (prescription!=null&&reviewed != null && prescription.getStatus() == PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue()&&reviewed.getReviewedTime()!=null) {
            Long s = (new Date().getTime()-reviewed.getReviewedTime().getTime()) / 1000;
            //rs.put("time",s);
            if (s > 172800) {
                prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.pay_outtime.getValue());
@@ -530,7 +537,7 @@ public class PrescriptionInfoService extends BaseService {
                p.setReviewedTime(new Date());
                reviewed.setReason(reason);
                reviewed.setReviewedTime(new Date());
                reviewed.setStatus(PrescriptionReviewed.PrescriptionReviewedStatus.del.getValue());
                reviewed.setStatus(PrescriptionReviewed.PrescriptionReviewedStatus.reviewed_fail.getValue());
                //修改系统的续方消息的审核状态
                messageDao.updatePreScriptionMessage(p.getConsult(), "2", 6);
@@ -821,10 +828,10 @@ public class PrescriptionInfoService extends BaseService {
        List<Map<String, Object>> states = new ArrayList<>();
        Map<String, Object> map0 = new HashMap<>();
        map0.put("name", "续方申请通过");
        map0.put("code", PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue());
        states.add(map0);
//        Map<String, Object> map0 = new HashMap<>();
//        map0.put("name", "续方申请通过");
//        map0.put("code", PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue());
//        states.add(map0);
        Map<String, Object> map1 = new HashMap<>();
        map1.put("name", "订单已支付");
@@ -1162,4 +1169,10 @@ public class PrescriptionInfoService extends BaseService {
        List<Map<String, Object>> rs = jdbcTemplate.queryForList(sql.toString());
        return new JSONArray(rs);
    }
    public JSONArray getPhysicMinDose(String code) {
        StringBuffer sql = new StringBuffer("SELECT t.min_dose AS minDose,t.physicCode FROM zy_iv_physic_dict t WHERE t.physic_code = ?");
        List<Map<String, Object>> rs = jdbcTemplate.queryForList(sql.toString());
        return new JSONArray(rs);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionNoticesService.java

@@ -14,6 +14,8 @@ import com.yihu.wlyy.wechat.util.WeiXinOpenIdUtils;
import com.ylzinfo.onepay.sdk.utils.StringUtil;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +35,7 @@ public class PrescriptionNoticesService extends BaseService {
    private WeiXinAccessTokenUtils weiXinAccessTokenUtils;
    @Autowired
    private WeiXinOpenIdUtils weiXinOpenIdUtils;
    private static final Logger LOGGER = LoggerFactory.getLogger(PrescriptionNoticesService.class);
    /**
@@ -46,6 +49,13 @@ public class PrescriptionNoticesService extends BaseService {
     * @param url       带参数的模板跳转链接
     */
    public void sendMessages(String patient, String doctName, String ordenTime, int type, int status, String url) throws Exception {
        LOGGER.info("=======================> sendMessages start!!");
        LOGGER.debug("patient "+patient);
        LOGGER.debug("doctName "+doctName);
        LOGGER.debug("ordenTime "+ordenTime);
        LOGGER.debug("type "+type);
        LOGGER.debug("status "+status);
        LOGGER.debug("url "+ url);
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        JSONArray jsonArray = null;
@@ -57,7 +67,6 @@ public class PrescriptionNoticesService extends BaseService {
        JSONObject sendJson = new JSONObject();
        String first = "";
        String remark = "";
        if (type == 1) {
            switch (status) {
                case 0:

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/SMSService.java

@@ -177,7 +177,51 @@ public class SMSService extends BaseService {
        }
        return "ok";
    }
    /**
     * 外部短信调用 发送短信验证码接口
     *
     * @param mobile 手机号
     * @param type   消息类型:11 外部接口调用
     * @return
     * @throws Exception
     */
    public String sendWithContent(String mobile, String ip, int type, String content) throws Exception {
        // 同一ip一天不允许超过10条短信
        String today = DateUtil.getStringDateShort();
        Date begin = DateUtil.strToDate(today + " 00:00:00", DateUtil.YYYY_MM_DD_HH_MM_SS);
        Date end = DateUtil.strToDate(today + " 23:59:59", DateUtil.YYYY_MM_DD_HH_MM_SS);
        // }
        // 一天的短信数不允许超过10条
        int count = smsDao.countByMobile(mobile, begin, end);
        if (count >= SystemConf.MAX_SMS_MOBILE) {
            return "当前手机号：[" + mobile + "]今天最多发送" + SystemConf.MAX_SMS_MOBILE + "条短信！";
        }
        // 保存短信发送记录
        SMS sms = new SMS();
        Date date = new Date();
        // 延后5分钟
        sms.setContent(content);
        sms.setDeadline(DateUtil.getNextMin(date, type == 10 ? 30 : 5));
        sms.setCzrq(date);
        sms.setMobile(mobile);
        sms.setIp(ip);
        sms.setType(type);
        sms.setStatus(1);
        // 调用总部发送信息的接口
        String result = HttpClientUtil.post(SystemConf.getInstance().getSmsUrl(), buildSmsParams(sms.getContent(), mobile), "GBK");
        JSONObject json = toJson(result);
        if (json == null) {
            // 发送失败
            throw new Exception("短信发送失败！");
        } else if (json.getInt("result") != 0) {
            return json.getString("description");
        } else {
            //发送成功，保存到数据库
            smsDao.save(sms);
        }
        return "ok";
    }
    /**
     * 发送短信
     *

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/gateway/GcClientDetailsService.java

@@ -0,0 +1,14 @@
package com.yihu.wlyy.service.gateway;
import com.yihu.wlyy.repository.gateway.GcClientDetailsDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by chenweida on 2017/8/17.
 */
@Service
public class GcClientDetailsService {
    @Autowired
    private GcClientDetailsDao gtClientDetailsDao;
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/gateway/GcTokenService.java

@@ -0,0 +1,14 @@
package com.yihu.wlyy.service.gateway;
import com.yihu.wlyy.repository.gateway.GcTokenLogDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by chenweida on 2017/8/17.
 */
@Service
public class GcTokenService {
    @Autowired
    private GcTokenLogDao tokenLogDao;
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -292,7 +292,7 @@ public class DoctorController extends BaseController {
            page = page >= 1 ? page - 1 : 0;
            List<Hospital> hos = hospitalService.getHospitals(type, province, city, town, key, page, pagesize);
            List<Hospital> hos = hospitalService.getHospitals(type, province, city, town, key,null, page, pagesize);
            return write(200, "查询成功", "data", hos);
        } catch (Exception e) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionCodeController.java

@@ -171,7 +171,7 @@ public class PrescriptionCodeController extends BaseController{
    public String scanQrcode(
            @RequestParam(value = "code",required = true) String code){
        try {
            PrescriptionDispensaryCode prescriptionDispensaryCode = prescriptionDispensaryCodeService.scanQrcode(code);
            PrescriptionDispensaryCode prescriptionDispensaryCode = prescriptionDispensaryCodeService.scanQrcode(code,getUID());
            return write(200, "扫码成功！", "data", prescriptionDispensaryCode);
        } catch (Exception e) {
            error(e);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -453,5 +453,14 @@ public class PrescriptionInfoController extends BaseController {
            return error(-1, "查询失败！");
        }
    }
    @RequestMapping(value = "/getPhysicMinDose", method = RequestMethod.GET)
    @ApiOperation(value = "获取药品最小用量")
    public String getPhysicMinDose(String code) {
        try {
            return write(200, "查询成功！", "data", prescriptionInfoService.getPhysicMinDose(code));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -96,6 +96,7 @@ public class PrescriptionLogController extends BaseController {
            for (int i = 0; i < expressageLogs.size(); i++) {
                PrescriptionExpressageLog prescriptionExpressageLog = expressageLogs.get(i);
                PrescriptionLog prescriptionLog = new PrescriptionLog();
                prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
@@ -117,20 +118,24 @@ public class PrescriptionLogController extends BaseController {
                    return 0;
                }
            });
            if (prescriptionLogs != null) {
            if (prescriptionLogs != null && prescriptionLogs.size() > 0) {
                JSONArray ja = new JSONArray();
                    prescriptionLogs.stream().forEach(one -> {
                        JSONObject jo = new JSONObject();
                        jo.put("createTime", DateUtil.dateToStrLong(one.getCreateTime()));
                        jo.put("statusName", one.getStatusName());
                        ja.put(jo);
                });
                for (int i = 0; i < prescriptionLogs.size(); i++) {
                    PrescriptionLog one = prescriptionLogs.get(i);
                    JSONObject jo = new JSONObject();
                    jo.put("createTime", DateUtil.dateToStrLong(one.getCreateTime()));
                    jo.put("statusName", one.getStatusName());
                    ja.put(jo);
                }
                return write(200, "获取处方流程成功", "data", ja);
            } else {
                return error(-1, "获取失败");
            }
        } catch (Exception e) {
        } catch (
                Exception e
                )
        {
            e.printStackTrace();
            return error(-1, "获取失败");
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/controller/GcHospitalController.java

@@ -0,0 +1,52 @@
package com.yihu.wlyy.web.gateway.controller;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.service.app.hospital.HospitalService;
import com.yihu.wlyy.web.gateway.vo.DoctorModel;
import com.yihu.wlyy.web.gateway.vo.HospitalModel;
import com.yihu.wlyy.web.gateway.vo.base.ResultOneModel;
import com.yihu.wlyy.web.gateway.vo.base.ResultPageListModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/8/17.
 */
@RestController
@RequestMapping("/wlyygc/hospital")
@Api(description = "医院相关服务，医院，科室")
public class GcHospitalController {
    @Autowired
    private HospitalService hospitalService;
    @RequestMapping(value = "/", method = RequestMethod.GET)
    @ApiOperation("获取医院列表")
    public ResultPageListModel<HospitalModel> doctor(
            @ApiParam(name = "provinceId", value = "省（国标编码 35000）", required = false) @RequestParam(value = "provinceId", required = false) String provinceId,
            @ApiParam(name = "cityId", value = "市（国标编码 350200）", required = false) @RequestParam(value = "provinceId", required = false) String cityId,
            @ApiParam(name = "townId", value = "区（国标编码 350206）", required = false) @RequestParam(value = "townId", required = false) String townId,
            @ApiParam(name = "hospitalId", value = "机构id", required = false) @RequestParam(value = "hospitalId", required = false) String hospitalId,
            @ApiParam(name = "hospitalName", value = "机构名称(支持模糊查询)", required = false) @RequestParam(value = "hospitalName", required = false) String hospitalName,
            @ApiParam(name = "page", value = "当前页（1开始）", required = false) @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
            @ApiParam(name = "pageSize", value = "每页大小", required = false) @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize
    ) {
        List<Hospital> hospitals = hospitalService.getHospitals(null, provinceId, cityId, townId, hospitalName, hospitalId, page, pageSize);
        List<HospitalModel> hospitalModels = new ArrayList<>();
        for (Hospital hospital : hospitals) {
            HospitalModel hospitalModel = new HospitalModel();
            BeanUtils.copyProperties(hospital, hospitalModel);
            hospitalModels.add(hospitalModel);
        }
        return new ResultPageListModel(page, pageSize, hospitalModels);
    }
}

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

@@ -0,0 +1,105 @@
package com.yihu.wlyy.web.gateway.controller;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.common.SMSService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.NetworkUtil;
import com.yihu.wlyy.web.gateway.vo.DoctorModel;
import com.yihu.wlyy.web.gateway.vo.PatientModel;
import com.yihu.wlyy.web.gateway.vo.base.BaseResultModel;
import com.yihu.wlyy.web.gateway.vo.base.ResultBatchModel;
import com.yihu.wlyy.web.gateway.vo.base.ResultOneModel;
import com.yihu.wlyy.wechat.util.WeiXinTempMsgSendUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
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;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/8/17.
 */
@RestController
@RequestMapping("/wlyygc/message")
@Api(description = "消息相关服务，包括短信，微信模板")
public class GcMessageController {
    private Logger logger= LoggerFactory.getLogger(GcMessageController.class);
    @Autowired
    private WeiXinTempMsgSendUtils weiXinTempMsgSendUtils;
    @Autowired
    private PatientService patientService;
    @Autowired
    private SMSService smsService;
    @RequestMapping(value = "/sendWXTemplate", method = RequestMethod.POST)
    @ApiOperation("给患者发送微信模板消息")
    public ResultBatchModel sendWXTemplate(
            @ApiParam(name = "codes", value = "患者code(多个逗号分割)", required = true) @RequestParam(value = "codes", required = true) String codes,
            @ApiParam(name = "templateId", value = "微信模板Id", required = true) @RequestParam(value = "templateId", required = true) String templateId,
            @ApiParam(name = "teampolateJson", value = "微信模板内容json格式", required = true) @RequestParam(value = "teampolateJson", required = true) String teampolateJson,
            @ApiParam(name = "url", value = "模板跳转的url", required = true) @RequestParam(value = "url", required = true) String url
    ) {
        Integer success = 0;
        Integer error = 0;
        List<String> errorLiust = new ArrayList<>();
        String[] codeArr = codes.split(",");
        for (String code : codeArr) {
            try {
                Patient patient = patientService.findByCode(code);
                weiXinTempMsgSendUtils.sendTemplateMessage(templateId, patient.getOpenid(), url, new JSONObject(teampolateJson));
                success++;
            } catch (Exception e) {
                logger.error("code "+code+"send Template error:"+e.getMessage());
                error++;
                errorLiust.add(code);
            }
        }
        return new ResultBatchModel(success, error, errorLiust);
    }
    @RequestMapping(value = "/sendMobileMessage", method = RequestMethod.POST)
    @ApiOperation("给手机号码发送短信消息")
    public ResultBatchModel sendMobileMessage(
            @ApiParam(name = "mobiles", value = "电话号码(批量逗号分割)", required = true) @RequestParam(value = "mobiles", required = true) String mobiles,
            @ApiParam(name = "content", value = "消息内容", required = true) @RequestParam(value = "content", required = true) String content,
            HttpServletRequest request
    ) {
        // 获取ip地址
        Integer success = 0;
        Integer error = 0;
        List<String> errorLiust = new ArrayList<>();
        try {
            String ip = NetworkUtil.getIpAddress(request);
            String[] mobileArr = mobiles.split(",");
            for (String mobile : mobileArr) {
                try {
                    smsService.sendWithContent(mobile, ip, 11, content);
                    success++;
                } catch (Exception e) {
                    logger.error("mobile "+mobile+"send message error:"+e.getMessage());
                    error++;
                    errorLiust.add(mobile);
                }
            }
            return new ResultBatchModel(success, error, errorLiust);
        } catch (Exception e) {
            return new ResultBatchModel(BaseResultModel.codeEm.error_no_ip.getCode(), "获取IP失败", success, error, errorLiust);
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/controller/GcTokenController.java

@@ -0,0 +1,29 @@
package com.yihu.wlyy.web.gateway.controller;
import com.yihu.wlyy.web.gateway.vo.base.ResultOneModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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 chenweida on 2017/8/17.
 * 对外的网关
 */
@RestController
@RequestMapping("/wlyygc")
@Api(description = "token相关服务")
public class GcTokenController {
    @ApiOperation("获取token")
    @RequestMapping(value = "token", method = RequestMethod.GET)
    public ResultOneModel getToken(
            @ApiParam(name = "appid", value = "appid", required = true) @RequestParam(required = true, value = "appid") String appid,
            @ApiParam(name = "appSecret", value = "appSecret", required = true) @RequestParam(required = true, value = "appSecret") String appSecret) {
        return null;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/controller/GcUserController.java

@@ -0,0 +1,52 @@
package com.yihu.wlyy.web.gateway.controller;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.web.gateway.vo.DoctorModel;
import com.yihu.wlyy.web.gateway.vo.PatientModel;
import com.yihu.wlyy.web.gateway.vo.base.ResultOneModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * Created by chenweida on 2017/8/17.
 */
@RestController
@RequestMapping("/wlyygc/user")
@Api(description = "用户相关服务")
public class GcUserController {
    @Autowired
    private DoctorService doctorService;
    @Autowired
    private PatientService patientService;
    @RequestMapping(value = "/doctor", method = RequestMethod.GET)
    @ApiOperation("根据医生code查询医生信息")
    public ResultOneModel<DoctorModel> doctor(
            @ApiParam(name = "code", value = "医生code", required = true) @RequestParam(value = "code", required = true) String code
    ) {
        Doctor doctor = doctorService.findDoctorByCode(code);
        DoctorModel doctorModel = new DoctorModel();
        BeanUtils.copyProperties(doctor, doctorModel);
        return new ResultOneModel(doctorModel);
    }
    @RequestMapping(value = "/patient", method = RequestMethod.GET)
    @ApiOperation("根据患者code查询患者信息")
    public ResultOneModel<DoctorModel> patient(
            @ApiParam(name = "code", value = "患者code", required = true) @RequestParam(value = "code", required = true) String code
    ) {
        Patient patient = patientService.findByCode(code);
        PatientModel patientModel = new PatientModel();
        BeanUtils.copyProperties(patient, patientModel);
        return new ResultOneModel(patientModel);
    }
}

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

@@ -0,0 +1,317 @@
package com.yihu.wlyy.web.gateway.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
 * Created by chenweida on 2017/8/17.
 */
@ApiModel("医生实体")
public class DoctorModel {
    @ApiModelProperty(value = "主键", required = false, access = "response")
    private String code;        // 业务主键
    @ApiModelProperty(value = "姓名", required = false, access = "response")
    private String name;        //姓名
    @ApiModelProperty(value = "性别（1男，2女）", required = false, access = "response")
    private Integer sex;        // 性别（1男，2女）
    @ApiModelProperty(value = "生日", required = false, access = "response")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date birthday;      //生日
    @ApiModelProperty(value = "头像http地址", required = false, access = "response")
    private String photo;       //头像http地址
    @ApiModelProperty(value = "手机号", required = false, access = "response")
    private String mobile;      //手机号
    @ApiModelProperty(value = "省code", required = false, access = "response")
    private String province;    //省code
    @ApiModelProperty(value = "市code", required = false, access = "response")
    private String city;         //市code
    @ApiModelProperty(value = "区县code", required = false, access = "response")
    private String town;         //区县code
    @ApiModelProperty(value = "省名称", required = false, access = "response")
    private String provinceName;//省名称
    @ApiModelProperty(value = "市名称", required = false, access = "response")
    private String cityName;    //市名称
    @ApiModelProperty(value = "区县名称", required = false, access = "response")
    private String townName;    //区县名称
    @ApiModelProperty(value = "医院代码", required = false, access = "response")
    private String hospital;        // 医院代码
    @ApiModelProperty(value = "医院名称", required = false, access = "response")
    private String hospitalName;    //医院名称
    @ApiModelProperty(value = "科室代码", required = false, access = "response")
    private String dept;            // 科室代码
    @ApiModelProperty(value = "科室名称", required = false, access = "response")
    private String deptName;        //可是名称
    @ApiModelProperty(value = "职称代码", required = false, access = "response")
    private String job;             // 职称代码
    @ApiModelProperty(value = "职称名", required = false, access = "response")
    private String jobName;         // 职称名
    @ApiModelProperty(value = "医生专长", required = false, access = "response")
    private String expertise;       // 医生专长
    @ApiModelProperty(value = "医生介绍", required = false, access = "response")
    private String introduce;       // 医生介绍
    @ApiModelProperty(value = "1专科医生，2全科医生，3健康管理师", required = false, access = "response")
    private Integer level;          // 类型：1专科医生，2全科医生，3健康管理师
    @ApiModelProperty(value = "资格是否认证通过，1是，0否", required = false, access = "response")
    private Integer iscertified;   // 资格是否认证通过，1是，0否
    @ApiModelProperty(value = "二维码", required = false, access = "response")
    private String qrcode;          // 二维码
    @ApiModelProperty(value = "身份证号", required = false, access = "response")
    private String idcard;          //身份证号
    @ApiModelProperty(value = "是否是名医", required = false, access = "response")
    private Integer isFamous;       //是否是名医 1是  0或者空不是
    @ApiModelProperty(value = "评分", required = false, access = "response")
    private Double evaluateScore;//评分
    @ApiModelProperty(value = "审方密码", required = false, access = "response")
    private String checkPassword;   //审方密码
    @ApiModelProperty(value = "审方密码的盐", required = false, access = "response")
    private String checkSalt;       //审方密码的盐
    @ApiModelProperty(value = "CA证书过期时间", required = false, access = "response")
    private Date certifiedOvertime; //CA证书过期时间
    @ApiModelProperty(value = "CA证书编号", required = false, access = "response")
    private String certificateNum;     //CA证书编号
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Integer getSex() {
        return sex;
    }
    public void setSex(Integer sex) {
        this.sex = sex;
    }
    public Date getBirthday() {
        return birthday;
    }
    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    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 getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    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 String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getJob() {
        return job;
    }
    public void setJob(String job) {
        this.job = job;
    }
    public String getJobName() {
        return jobName;
    }
    public void setJobName(String jobName) {
        this.jobName = jobName;
    }
    public String getExpertise() {
        return expertise;
    }
    public void setExpertise(String expertise) {
        this.expertise = expertise;
    }
    public String getIntroduce() {
        return introduce;
    }
    public void setIntroduce(String introduce) {
        this.introduce = introduce;
    }
    public Integer getLevel() {
        return level;
    }
    public void setLevel(Integer level) {
        this.level = level;
    }
    public Integer getIscertified() {
        return iscertified;
    }
    public void setIscertified(Integer iscertified) {
        this.iscertified = iscertified;
    }
    public String getQrcode() {
        return qrcode;
    }
    public void setQrcode(String qrcode) {
        this.qrcode = qrcode;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public Integer getIsFamous() {
        return isFamous;
    }
    public void setIsFamous(Integer isFamous) {
        this.isFamous = isFamous;
    }
    public Double getEvaluateScore() {
        return evaluateScore;
    }
    public void setEvaluateScore(Double evaluateScore) {
        this.evaluateScore = evaluateScore;
    }
    public String getCheckPassword() {
        return checkPassword;
    }
    public void setCheckPassword(String checkPassword) {
        this.checkPassword = checkPassword;
    }
    public String getCheckSalt() {
        return checkSalt;
    }
    public void setCheckSalt(String checkSalt) {
        this.checkSalt = checkSalt;
    }
    public Date getCertifiedOvertime() {
        return certifiedOvertime;
    }
    public void setCertifiedOvertime(Date certifiedOvertime) {
        this.certifiedOvertime = certifiedOvertime;
    }
    public String getCertificateNum() {
        return certificateNum;
    }
    public void setCertificateNum(String certificateNum) {
        this.certificateNum = certificateNum;
    }
}

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

@@ -0,0 +1,172 @@
package com.yihu.wlyy.web.gateway.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by chenweida on 2017/8/17.
 */
@ApiModel("医生实体")
public class HospitalModel {
    @ApiModelProperty(value = "医院編碼", required = false, access = "response")
    private String code;            // 医院編碼
    @ApiModelProperty(value = "医院名稱", required = false, access = "response")
    private String name;            // 医院名稱
    @ApiModelProperty(value = "作废标志", required = false, access = "response")
    private String del;             // 作废标志
    @ApiModelProperty(value = "省份标志", required = false, access = "response")
    private String province;        //省份标志
    @ApiModelProperty(value = "省份名称", required = false, access = "response")
    private String provinceName;    //省份名称
    @ApiModelProperty(value = "城市标志", required = false, access = "response")
    private String city;            //城市标志
    @ApiModelProperty(value = "城市名称", required = false, access = "response")
    private String cityName;        //城市名称
    @ApiModelProperty(value = "区县标志", required = false, access = "response")
    private String town;            //区县标志
    @ApiModelProperty(value = "区县名称", required = false, access = "response")
    private String townName;        //区县名称
    @ApiModelProperty(value = "级别，1医院，2社区医院", required = false, access = "response")
    private Integer level;          //级别，1医院，2社区医院
    @ApiModelProperty(value = "医院详细地址", required = false, access = "response")
    private String address;         //医院详细地址
    @ApiModelProperty(value = "医院简介", required = false, access = "response")
    private String intro;           //医院简介
    @ApiModelProperty(value = "医院图片", required = false, access = "response")
    private String photo;           //医院图片
    @ApiModelProperty(value = "街道编码", required = false, access = "response")
    private String roadCode;        //街道编码
    @ApiModelProperty(value = "中心/站点", required = false, access = "response")
    private String centerSite;      //中心/站点
    @ApiModelProperty(value = "联系电话", required = false, access = "response")
    private String phone;            //联系电话
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    public Integer getLevel() {
        return level;
    }
    public void setLevel(Integer level) {
        this.level = level;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public String getIntro() {
        return intro;
    }
    public void setIntro(String intro) {
        this.intro = intro;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    public String getRoadCode() {
        return roadCode;
    }
    public void setRoadCode(String roadCode) {
        this.roadCode = roadCode;
    }
    public String getCenterSite() {
        return centerSite;
    }
    public void setCenterSite(String centerSite) {
        this.centerSite = centerSite;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
}

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

@@ -0,0 +1,80 @@
package com.yihu.wlyy.web.gateway.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
 * Created by chenweida on 2017/8/17.
 */
public class PatientModel {
    // 业务主键
    @ApiModelProperty(value = "业务主键", required = false, access = "response")
    private String code;
    // 身份证号
    @ApiModelProperty(value = "身份证号", required = false, access = "response")
    private String idcard;
    // 姓名
    @ApiModelProperty(value = "姓名", required = false, access = "response")
    private String name;
    // 生日
    @ApiModelProperty(value = "生日", required = false, access = "response")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date birthday;
    // 性別，1男，2女
    @ApiModelProperty(value = "性別，1男，2女", required = false, access = "response")
    private Integer sex;
    // 手機號
    @ApiModelProperty(value = "手機號", required = false, access = "response")
    private String mobile;
    // 聯繫電話
    @ApiModelProperty(value = "聯繫電話", required = false, access = "response")
    private String phone;
    // 社保卡號
    @ApiModelProperty(value = "社保卡號", required = false, access = "response")
    private String ssc;
    // 頭像HTTP地址
    @ApiModelProperty(value = "頭像HTTP地址", required = false, access = "response")
    private String photo;
    // 省代碼
    @ApiModelProperty(value = "省代碼", required = false, access = "response")
    private String province;
    // 城市代碼
    @ApiModelProperty(value = "城市代碼", required = false, access = "response")
    private String city;
    // 區縣代碼
    @ApiModelProperty(value = "區縣代碼", required = false, access = "response")
    private String town;
    // 街道代码
    @ApiModelProperty(value = "街道代码", required = false, access = "response")
    private String street;
    // 省名
    @ApiModelProperty(value = "省名", required = false, access = "response")
    private String provinceName;
    // 市名
    @ApiModelProperty(value = "市名", required = false, access = "response")
    private String cityName;
    // 區縣名
    @ApiModelProperty(value = "區縣名", required = false, access = "response")
    private String townName;
    // 街道名称
    @ApiModelProperty(value = "街道名称", required = false, access = "response")
    private String streetName;
    // 地址
    @ApiModelProperty(value = "地址", required = false, access = "response")
    private String address;
    // 居委会字段id
    @ApiModelProperty(value = "居委会字段id", required = false, access = "response")
    private String sickVillage;
    // 居委会字段名称
    @ApiModelProperty(value = "居委会字段名称", required = false, access = "response")
    private String sickVillageName;
    //	是否绑定电子社保卡
    @ApiModelProperty(value = "是否绑定电子社保卡", required = false, access = "response")
    private Integer sicardStatus;
    //	绑定电子社保卡时间
    @ApiModelProperty(value = "绑定电子社保卡时间", required = false, access = "response")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date sicardTime;
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/vo/base/BaseResultModel.java

@@ -0,0 +1,66 @@
package com.yihu.wlyy.web.gateway.vo.base;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by chenweida on 2017/8/17.
 */
@ApiModel("返回实体")
public class BaseResultModel {
    @ApiModelProperty(value = "状态", required = false, access = "response")
    protected Integer code = codeEm.success.getCode();
    @ApiModelProperty(value = "信息", required = false, access = "response")
    protected String message = "成功";
    public Integer getCode() {
        return code;
    }
    public void setCode(Integer code) {
        this.code = code;
    }
    public String getMessage() {
        return message;
    }
    public void setMessage(String message) {
        this.message = message;
    }
    public enum codeEm {
        success(10000),//请求成功
        error_params(-10000),//请求失败 参数错误
        error_no_ip(-10010),//请求失败,获取IP失败
        token_outEffect(997),//token无效  包括过期
        token_no_power(999)// 没权限 包括未授权 或者uri错误
        ;
        codeEm(Integer code) {
            this.code = code;
        }
        private Integer code;
        public Integer getCode() {
            return code;
        }
        public void setCode(Integer code) {
            this.code = code;
        }
    }
    public BaseResultModel() {
    }
    public BaseResultModel(String message) {
        this.message = message;
    }
    public BaseResultModel(Integer code, String message) {
        this.code = code;
        this.message = message;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/vo/base/ResultBatchModel.java

@@ -0,0 +1,65 @@
package com.yihu.wlyy.web.gateway.vo.base;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/8/17.
 */
@ApiModel("返回实体")
public class ResultBatchModel extends BaseResultModel {
    @ApiModelProperty(value = "成功数目", required = false, access = "response")
    private Integer success = 0;
    @ApiModelProperty(value = "失败数目", required = false, access = "response")
    private Integer error = 0;
    @ApiModelProperty(value = "失败List", required = false, access = "response")
    private List<String> errorList = new ArrayList<>();
    public ResultBatchModel(Integer success, Integer error, List<String> errorList) {
        this.success = success;
        this.error = error;
        this.errorList = errorList;
    }
    public ResultBatchModel(Integer code, String message, Integer success, Integer error, List<String> errorList) {
        super(code, message);
        this.success = success;
        this.error = error;
        this.errorList = errorList;
    }
    public ResultBatchModel() {
    }
    public Integer getSuccess() {
        return success;
    }
    public void setSuccess(Integer success) {
        this.success = success;
    }
    public Integer getError() {
        return error;
    }
    public void setError(Integer error) {
        this.error = error;
    }
    public List<String> getErrorList() {
        return errorList;
    }
    public void setErrorList(List<String> errorList) {
        this.errorList = errorList;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/vo/base/ResultListModel.java

@@ -0,0 +1,23 @@
package com.yihu.wlyy.web.gateway.vo.base;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
/**
 * Created by chenweida on 2017/8/17.
 */
public class ResultListModel<T> extends BaseResultModel {
    @ApiModelProperty(value = "返回数据", required = false, access = "response")
    private List<T> result;
    public List<T> getResult() {
        return result;
    }
    public void setResult(List<T> result) {
        this.result = result;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/vo/base/ResultOneModel.java

@@ -0,0 +1,29 @@
package com.yihu.wlyy.web.gateway.vo.base;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by chenweida on 2017/8/17.
 * 对外放回的实体
 */
@ApiModel("返回的实体类")
public class ResultOneModel<T> extends BaseResultModel {
    @ApiModelProperty(value = "返回数据", required = false, access = "response")
    private T result;
    public T getResult() {
        return result;
    }
    public void setResult(T result) {
        this.result = result;
    }
    public ResultOneModel(T result) {
        this.result = result;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/gateway/vo/base/ResultPageListModel.java

@@ -0,0 +1,52 @@
package com.yihu.wlyy.web.gateway.vo.base;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
/**
 * Created by chenweida on 2017/8/17.
 */
public class ResultPageListModel<T> extends BaseResultModel {
    @ApiModelProperty(value = "当前页", required = false, access = "response")
    private Integer page;
    @ApiModelProperty(value = "每页大小", required = false, access = "response")
    private Integer pageSize;
    @ApiModelProperty(value = "返回数据", required = false, access = "response")
    private List<T> result;
    public List<T> getResult() {
        return result;
    }
    public void setResult(List<T> result) {
        this.result = result;
    }
    public Integer getPage() {
        return page;
    }
    public void setPage(Integer page) {
        this.page = page;
    }
    public Integer getPageSize() {
        return pageSize;
    }
    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }
    public ResultPageListModel(Integer page, Integer pageSize, List<T> result) {
        this.page = page;
        this.pageSize = pageSize;
        this.result = result;
    }
    public ResultPageListModel() {
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionLogController.java

@@ -61,11 +61,13 @@ public class PatientPrescriptionLogController extends BaseController {
            for (int i = 0; i < expressageLogs.size(); i++) {
                PrescriptionExpressageLog prescriptionExpressageLog = expressageLogs.get(i);
                PrescriptionLog prescriptionLog = new PrescriptionLog();
                prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLogs.add(prescriptionLog);
            }
            //排序
@@ -81,15 +83,15 @@ public class PatientPrescriptionLogController extends BaseController {
                    return 0;
                }
            });
            if (prescriptionLogs != null) {
            if (prescriptionLogs != null && prescriptionLogs.size() > 0) {
                JSONArray ja = new JSONArray();
                prescriptionLogs.stream().forEach(one -> {
                for (int i = 0; i < prescriptionLogs.size(); i++) {
                    PrescriptionLog one = prescriptionLogs.get(i);
                    JSONObject jo = new JSONObject();
                    jo.put("createTime", DateUtil.dateToStrLong(one.getCreateTime()));
                    jo.put("statusName", one.getStatusName());
                    ja.put(jo);
                });
                }
                return write(200, "获取处方流程成功", "data", ja);
            } else {
                return error(-1, "获取失败");

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -456,7 +456,7 @@ images:
sign:
  check_upload: http://172.19.103.87:8011/wlyy_service
  check_upload: http://172.19.103.88:8011/wlyy_service
quartz: