代码修改

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

@@ -404,14 +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){
                jsonObject.put("birthday",IdCardUtil.getBirthdayForIdcardStr(jsonObject.getString("idcard")));
                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());
@@ -428,10 +432,11 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
                    obj.setLiveCountyName(patientDo.getLiveTownName());
                    obj.setLiveStreet(patientDo.getLiveStreetCode());
                    obj.setLiveStreetName(patientDo.getLiveStreetName());
                    obj.setBirthday(IdCardUtil.getBirthdayForIdcardStr(obj.getIdcard()));
                    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){