Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/PatientConsultEndpoint.java

@@ -113,6 +113,9 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "patient", value = "居民CODE")
			@RequestParam(value = "patient",required = true) String patient)throws Exception {
		try {
			if (StringUtils.isBlank(orgCode)&&StringUtils.isBlank(sessionId)){
				return Envelop.getError("参数错误请求失败");
			}
			return success("请求成功",consultService.findLastOnlineConsult(patient, orgCode,sessionId));
		}catch (Exception e){
			return failedException(e);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PatientEndpoint.java

@@ -147,8 +147,10 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            }
            return success("修改成功");
        }catch (Exception e){
            if (e.getMessage().contains("重复签约服务项目")){
                return failed("修改失败,"+e.getMessage(),-1);
            if (e.getMessage()!=null){
                if (e.getMessage().contains("重复签约服务项目")){
                    return failed("修改失败,"+e.getMessage(),-1);
                }
            }
            e.printStackTrace();
            return failed("修改失败",-1);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -188,8 +188,10 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        patientBrief.setMobile(patientDetail.getMobile());
        patientBrief.setMobileRemarks(patientDetail.getMobileRemarks());
        patientDao.save(patientBrief);
        JSONObject jsonObject1 = jsonObject.getJSONObject("signRecordDO");
        JSONObject jsonObject1 = null;
        if (jsonObject.containsKey("signRecordDO")){
            jsonObject1 = jsonObject.getJSONObject("signRecordDO");
        }
        JSONObject result  = new JSONObject();
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg,"修改成功");