diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java index f56c4eac..5e8f92fc 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java @@ -94,7 +94,7 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa question = CollUtil.newArrayList(askTemplateQuestionLibrary.getDescription()); one.setDefaultAnswer(askTemplateQuestionLibrary.getDefaultAnswer()); }else if (!question.contains(askTemplateQuestionLibrary.getDescription())){ - question.add(askTemplateQuestionLibrary.getDescription()); + question.add(0,askTemplateQuestionLibrary.getDescription()); } if (StrUtil.isNotEmpty(askTemplateQuestionLibrary.getDefaultAnswer())){ one.setDefaultAnswer(askTemplateQuestionLibrary.getDefaultAnswer()); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java index 811a5a24..be68d042 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java @@ -225,6 +225,9 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { askPatientAnswer.setMedicalId(medicalRec.getId()); askPatientAnswer.setAnswerResourceId(medicalRecQaVO.getAnswerResourceId()); askPatientAnswer.setQuestion(CollUtil.getFirst(medicalRecQaVO.getQuestionList())); + if (null == askPatientAnswer.getAnswerType()){ + askPatientAnswer.setAnswerType(1); + } askPatientAnswer.insert(); } } diff --git a/virtual-patient-manage/src/test/java/com/supervision/manage/VirtualPatientManageApplicationTests.java b/virtual-patient-manage/src/test/java/com/supervision/manage/VirtualPatientManageApplicationTests.java index 4085dbb2..1eeaa65e 100644 --- a/virtual-patient-manage/src/test/java/com/supervision/manage/VirtualPatientManageApplicationTests.java +++ b/virtual-patient-manage/src/test/java/com/supervision/manage/VirtualPatientManageApplicationTests.java @@ -3,6 +3,7 @@ package com.supervision.manage; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.json.JSONUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; @@ -11,8 +12,10 @@ import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo; import com.supervision.manage.pojo.vo.UploadQuestionLibraryResVo; import com.supervision.manage.service.AnswerVideoResourceService; import com.supervision.manage.service.AskQuestionLibraryManageService; +import com.supervision.model.CommonDic; import com.supervision.service.AskPatientAnswerService; import com.supervision.service.AskTemplateQuestionLibraryService; +import com.supervision.service.CommonDicService; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +23,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.mock.web.MockMultipartFile; import java.io.*; -import java.nio.file.Files; import java.util.*; import java.util.stream.Collectors; @@ -101,4 +103,84 @@ class VirtualPatientManageApplicationTests { } + + @Autowired + private CommonDicService commonDicService; + /** + * 更新问答数据字典 + */ + @Test + public void updateAQTDicTest(){ + + // 类目1 类目2 + + List> mapList = loadItems(); + + Set item1s = mapList.stream().map(item -> item.get("item1")).collect(Collectors.toSet()); + + log.info("----update begin---"); + List parents = new ArrayList<>(); + int i = 1; + for (String item1 : item1s) { + CommonDic commonDic = new CommonDic(); + commonDic.setNameZh(item1); + commonDic.setNameZhPath(item1); + commonDic.setGroupCode("AQT"); + commonDic.setCode(item1); + commonDic.setPriority(i); + log.info("save:{}", commonDic.getNameZh()); + // commonDicService.save(commonDic); + parents.add(commonDic); + i ++; + } + + Map> parentMap = parents.stream().collect(Collectors.groupingBy(CommonDic::getNameZh)); + + i = 1; + for (Map map : mapList) { + String item1 = map.get("item1"); + String item2 = map.get("item2"); + CommonDic commonDic = new CommonDic(); + commonDic.setNameZh(item2); + commonDic.setNameZhPath(item1 + "/" + item2); + commonDic.setGroupCode("AQT"); + commonDic.setCode(item1 + "/" + item2); + commonDic.setParentId(CollUtil.getFirst(parentMap.get(item1)).getId()); + commonDic.setPriority(i ++); + log.info("save:{}", commonDic.getNameZh()); + // commonDicService.save(commonDic); + } + log.info("----update end---"); + + } + + private static List> loadItems(){ + + String s = "现病史 发病时间\n" + + "现病史 发病时间\n"; + + + List> mapList = new ArrayList<>(); + HashSet sets = new HashSet<>(); + String[] split = s.split("\n"); + + for (String string : split) { + String[] split1 = string.split(" "); + Assert.isTrue(split1.length ==2, "数据格式错误"); + Map map = new HashMap<>(); + map.put("item1", split1[0]); + map.put("item2", split1[1]); + if (sets.add(split1[0]+split1[1])){ + mapList.add(map); + } + + } + return mapList; + + } + + public static void main(String[] args) { + List> mapList = loadItems(); + } + }