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

Conflicts:
	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

common/common-entity/src/main/java/com/yihu/jw/entity/care/sign/CapacityAssessmentBaseInfoDo.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * 能力评估-基本信息表
@@ -79,6 +80,7 @@ public class CapacityAssessmentBaseInfoDo extends UuidIdentityEntityWithCreateTi
    private String  acceptableServicesMental; //精神心理照顾 1危机干预;2沟通;3精神支持;4心理疏导;5心理咨询
    private String  acceptableServicesRehabilitation; //康复护理照顾 1定期翻身;2压疮预;3防活动肢体;4肢体保健;5康复活动;6预防保健;7健康咨询;8健康管理;9健康教育;10临终关怀
    private String  acceptableServicesOther;  //其他
    private String  birthday;  //出生日期
    public String getAssessmentYear() {
        return assessmentYear;
@@ -607,4 +609,13 @@ public class CapacityAssessmentBaseInfoDo extends UuidIdentityEntityWithCreateTi
    public void setAcceptableServicesOther(String acceptableServicesOther) {
        this.acceptableServicesOther = acceptableServicesOther;
    }
    @Transient
    public String getBirthday() {
        return birthday;
    }
    public void setBirthday(String birthday) {
        this.birthday = birthday;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doctor/CareDoctorService.java

@@ -44,9 +44,9 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
     * @return
     */
    public Map<String,Object> doctorInfo(String doctorId,String isRole){
        String sql = "SELECT d.id,d.name,d.level,d.photo,d.introduce,d.expertise,d.mobile,d.idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        sql += " ,h.org_code orgCode,h.org_name orgName from base_doctor d left join base_doctor_hospital h on d.id = h.doctor_code  and h.del = 1" +
                " WHERE d.id = '"+doctorId+"' limit 1 ";
        String sql = "SELECT d.id,d.name,d.level,d.photo,d.introduce,d.mobile,d.idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        sql += " ,h.org_code orgCode,org.address orgAddress,h.org_name orgName from base_doctor d left join base_doctor_hospital h on d.id = h.doctor_code  and h.del = 1" +
                " LEFT JOIN base_org org on h.org_code = org.`code`  WHERE d.id = '"+doctorId+"' limit 1 ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        Map<String,Object> map = list.get(0);
        String idcard = map.get("idcard").toString();

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

@@ -404,11 +404,18 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
                O1 = c1.newInstance();
            }
            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(O1, SerializerFeature.WriteMapNullValue));
            jsonObject.put("patient",patient);
            if (item==1){
                if (StringUtils.isNotBlank(jsonObject.getString("idcard"))){
                    jsonObject.put("birthday",IdCardUtil.getBirthdayForIdcardStr(jsonObject.getString("idcard")));
                }
                jsonObject.put("birthday",null);
            }
            if (!searchFlag && item == 1) {//基本信息带入
                CapacityAssessmentBaseInfoDo obj = new CapacityAssessmentBaseInfoDo();
                BasePatientDO patientDo = patientDao.findById(patient);
                obj.setPatient(patient);
                if (patientDo != null) {
                    obj.setPatient(patientDo.getId());
                    obj.setName(patientDo.getName());
                    obj.setSex(patientDo.getSex());
                    obj.setIdcard(patientDo.getIdcard());
@@ -425,9 +432,11 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
                    obj.setLiveCountyName(patientDo.getLiveTownName());
                    obj.setLiveStreet(patientDo.getLiveStreetCode());
                    obj.setLiveStreetName(patientDo.getLiveStreetName());
                    if (StringUtils.isNotBlank(obj.getIdcard())){
                        obj.setBirthday(IdCardUtil.getBirthdayForIdcardStr(obj.getIdcard()));
                    }
                    jsonObject = JSON.parseObject(JSON.toJSONString(obj, SerializerFeature.WriteMapNullValue));
                }
            }
            result.put(keyName, jsonObject);
            if (allSearch){

svr/svr-cloud-care/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-cloud-care
    name:  svr-cloud-care-ysj
  cloud:
    config:
      failFast: true