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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/PatientHealthGuidanceService.java

@@ -4,7 +4,6 @@ import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientHealthGuidance;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.wechat.WechatTemplateConfig;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.PatientHealthGuidanceDao;
@@ -112,13 +111,9 @@ public class PatientHealthGuidanceService extends BaseService {
		SignFamily signFamily = signFamilyDao.findByjiatingPatient(guidance.getPatient());
		//家庭医生不存在
		if(signFamily == null){
			 signFamily = signFamilyDao.findBySanshiPatient(guidance.getPatient());
			 if(signFamily==null){
			 	throw new RuntimeException("患者未签约！");
			 }
			 return null;
		}
		guidance.setCzrq(new Date());
		guidance.setCreateTime(new Date());
		guidance.setDel("1");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java

@@ -13,7 +13,6 @@ import com.yihu.wlyy.service.template.DoctorGuidanceTempService;
import com.yihu.wlyy.service.template.DoctorTeamGuidanceService;
import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import com.yihu.wlyy.web.third.ylzpay.ThirdOnepayController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -194,7 +193,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
                    BusinessLogs.info(BusinessLogs.BusinessType.guidance, getUID(), patient, new JSONObject(guidance));
                    return success("保存成功！");
                } else {
                    return error(-1, "保存失败！");
                    return error(-1, "居民签约已到期，请使用文字回复。");
                }
            } catch (Exception e) {
                error(e);
@@ -247,7 +246,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
                    doctorGuidanceTempService.countSend(modelCode);
                    return success("保存成功！");
                } else {
                    return error(-1, "保存失败！");
                    return error(-1, "居民签约已到期，请使用文字回复。");
                }
            } catch (Exception e) {
                error(e);

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

@@ -43,6 +43,10 @@ healthBank:
rehabilitation:
  url: http://localhost:10055/svr-rehabilitation/
#康复计划配置
rehabilitation:
  url: http://localhost:10055/svr-rehabilitation/
wechat:
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537

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

@@ -33,6 +33,10 @@ im:
iot:
  url: http://192.168.131.24:8088/svr-iot/
#康复计划配置
rehabilitation:
  url: http://localhost:10055/svr-rehabilitation/
wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3

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

@@ -33,6 +33,10 @@ im:
iot:
  url: http://192.168.131.24:8088/svr-iot/
#康复计划配置
rehabilitation:
  url: http://localhost:10055/svr-rehabilitation/
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb

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

@@ -36,6 +36,10 @@ im:
iot:
  url: http://192.168.131.24:8088/svr-iot/
#康复计划配置
rehabilitation:
  url: http://localhost:10055/svr-rehabilitation/
wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3

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

@@ -32,6 +32,10 @@ im:
iot:
  url: http://172.19.103.33:8088/svr-iot/
#康复计划配置
rehabilitation:
  url: http://localhost:10055/svr-rehabilitation/
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb