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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwSignService.java

@@ -23,6 +23,8 @@ public class JwSignService {
    @Value("${sign.check_upload}")
    private String jwUrl;
    @Value("${sign.check_upload_sign}")
    private String jwSignUrl;
    /****************************************************************************************************************************/
    /**
@@ -77,4 +79,24 @@ public class JwSignService {
        return HttpClientUtil.post(url, params, "UTF-8");
    }
    
    /**
     * 根据身份证号同步居民签约信息
     */
    public String LoadSignFamilyByIdcard(String idcard) throws Exception {
        String url = jwSignUrl + "/third/sign/LoadSignFamilyByIdcard";
        
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("idcard", idcard));
        
        String result =HttpClientUtil.post(url, params, "UTF-8");
        
        com.alibaba.fastjson.JSONObject rejson = com.alibaba.fastjson.JSONObject.parseObject(result);
        
        if(rejson.getInteger("status")!=200){
            throw new Exception("更新签约失败！");
        }
        return "更新签约成功！";
        
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorSignController.java

@@ -6,6 +6,7 @@ import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.account.PatientInfoService;
import com.yihu.wlyy.service.app.sign.SignWebService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.service.third.jw.JwSignService;
import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.IdCardUtil;
@@ -41,6 +42,8 @@ public class DoctorSignController extends WeixinBaseController {
    private PatientInfoService patientInfoService;
    @Autowired
    private SignWebService signWebService;
    @Autowired
    private JwSignService jwSignService;
    @Autowired
    private CommonUtil CommonUtil;
@@ -799,4 +802,22 @@ public class DoctorSignController extends WeixinBaseController {
            return error(-1, "查询失败");
        }
    }
    
    /**
     * 根据身份证号同步居民签约信息
     * @param idcard
     * @return
     */
    @RequestMapping(value = "/loadSignFamilyByIdcard", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String loadSignFamilyByIdcard(@RequestParam(required = true)String idcard){
        try {
            String re = jwSignService.LoadSignFamilyByIdcard(idcard);
            Patient patient = patientService.findByIdcard(idcard);
            return write(200, "更新签约成功","patient",patient);
        } catch (Exception e) {
            error(e);
            return error(-1, "更新签约失败！");
        }
    }
}

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

@@ -116,6 +116,7 @@ images:
sign:
  check_upload: http://172.19.103.88:8011/wlyy_service
  check_upload_sign: http://172.19.103.88:8011/wlyy_sign
  #check_upload: http://localhost:8070/

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

@@ -106,6 +106,7 @@ images:
sign:
  check_upload: http://10.95.22.10:8011/wlyy_service
  check_upload_sign: http://10.95.22.10:8011/wlyy_sign
express:
  sf_url: http://bsp-ois.sit.sf-express.com:9080/bsp-ois/sfexpressService

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

@@ -113,6 +113,7 @@ images:
sign:
  check_upload: http://59.61.92.90:8072/wlyy_service
  check_upload_sign: http://59.61.92.90:8072/wlyy_sign
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService

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

@@ -106,6 +106,7 @@ images:
sign:
  check_upload: http://172.19.103.88:8011/wlyy_service
  check_upload_sign: http://172.19.103.88:8011/wlyy_sign
express:
  sf_url: http://218.17.248.244:11080/bsp-oisp/sfexpressService

patient-co/patient-co-wlyy/src/main/resources/system.properties

@@ -35,7 +35,7 @@ patient_immune_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={ap
#居民wifi图片地址
patient_wifi_pic_url = {server}/images/wifi.png
#居民抽奖图片地址
patient_draw_pic_url = {server}/images/banner01.png
patient_draw_pic_url = {server}/images/banner02.png
#专科医生签约图片地址
specialist_sign_url = {server}/images/SpBanner.png
#通用活动图片地址