|
@ -67,7 +67,7 @@ public class PrescriptionFollowupContentService extends BaseService {
|
|
|
String followupProject = jsonObject.getString("followupProject");
|
|
|
String projectValueStr = jsonObject.getString("projectData");
|
|
|
if(StringUtils.isNotBlank(projectValueStr)){
|
|
|
HashMap<String,String> projectValueMap = (HashMap)JSON.parse(projectValueStr);
|
|
|
Map<String,String> projectValueMap = (Map)JSON.parse(projectValueStr);
|
|
|
if(!projectValueMap.isEmpty()){
|
|
|
projectValueMap.forEach( (key,value)->{
|
|
|
PrescriptionFollowupContent prescriptionFollowupContent = new PrescriptionFollowupContent();
|
|
@ -136,7 +136,7 @@ public class PrescriptionFollowupContentService extends BaseService {
|
|
|
JSONObject jsonObject1 = new JSONObject();
|
|
|
jsonObject1.put("type","1");
|
|
|
jsonObject1.put("name","身份异常症状问卷");
|
|
|
jsonObject1.put("statue","已填写");
|
|
|
jsonObject1.put("statue","1");//1已填写,2未填写
|
|
|
jsonObject1.put("createtime",prescriptionFollowupContent1.getCreateTime());
|
|
|
result.add(jsonObject1);
|
|
|
}
|
|
@ -145,7 +145,7 @@ public class PrescriptionFollowupContentService extends BaseService {
|
|
|
JSONObject jsonObject2 = new JSONObject();
|
|
|
jsonObject2.put("type","2");
|
|
|
jsonObject2.put("name","体征及生活方式调查问卷");
|
|
|
jsonObject2.put("statue","已填写");
|
|
|
jsonObject2.put("statue","1");//1已填写,2未填写
|
|
|
jsonObject2.put("createtime",prescriptionFollowupContent1.getCreateTime());
|
|
|
result.add(jsonObject2);
|
|
|
}
|