Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -58,7 +58,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、8、9时为续方code type = 10\11时为申诉和反馈ID 12.协同服务code,14和15是文章审核功能是（0未认证1已认证2未通过）16.专科医生申请签约消息
	private String relationCode;//业务关联code，type=6时为咨询code,type=7、8、9时为续方code type = 10\11时为申诉和反馈ID 12.协同服务code,14和15是文章审核功能是（0未认证1已认证2未通过）16.专科医生申请签约消息 301.为患者code 21.wlyy_specialist里的wlyy_rehabilitation_plan_detail的id
	private String prescriptionStatus;//type=6续方审核状态 0待审核，1审核通过，2审核失败，3居民取消|type=7续方状态 0待取药，1已取药
	public String getCode() {

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

@@ -17,7 +17,7 @@ public interface PatientAimSportsDao extends
    @Query("from PatientAimSports p where p.code=?1")
    PatientAimSports findByCode(String code);
    @Query("from PatientAimSports p where p.patientcode =?1")
    @Query("from PatientAimSports p where p.patientcode =?1 and p.bmiMax is not null and p.bmiMin is not null")
    PatientAimSports getPatientAimSportsByPatientCode(String patientCode);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/rehabilitation/RehabilitationManageService.java

@@ -533,11 +533,20 @@ public class RehabilitationManageService extends BaseService {
        JSONObject result = new JSONObject(response.getContent());
        if(result.getInt("status") == 200){
            JSONObject object = result.getJSONObject("obj");
            //保存wlyy_message
            String hospotal = object.getString("hospital");
            String patient = object.getString("patient_code");
            String doctor = object.getString("doctor_code");
            Message message = new Message();
            message.setType(21);
            message.setSender(patient);
            message.setReceiver(doctor);
            message.setRelationCode(planDetailId);
            specialistEvaluateSevice.sendMessage(message,hospotal,patient,null);
            //发送微信模板消息
            int evaluation = object.getInt("evaluation");
            if (evaluation == 1){
                String serviceItemId = object.getString("service_item_id");
                String doctor = object.getString("doctor_code");
                String patient = object.getString("patient_code");
                String title = object.getString("title");
                Patient p = patientDao.findByCode(patient);
                String patientName = p.getName();