|
@@ -25,6 +25,7 @@ import thyyxxk.webserver.entity.medicalinsurance.inpatient.ZyPatientInfo;
|
|
|
import thyyxxk.webserver.entity.zhuyuanyisheng.ZyZkList;
|
|
|
import thyyxxk.webserver.entity.zhuyuanyisheng.emr.*;
|
|
|
import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshYjReq;
|
|
|
+import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.XinZhenYiZhu;
|
|
|
import thyyxxk.webserver.service.PublicServer;
|
|
|
import thyyxxk.webserver.service.externalhttp.emr.EmrEditor;
|
|
|
import thyyxxk.webserver.service.redislike.RedisLikeService;
|
|
@@ -64,10 +65,6 @@ public class EmrServer {
|
|
|
* @return 数据
|
|
|
*/
|
|
|
public ResultVo<List<JSONObject>> getPatientDataTree(String patNo, Integer times) {
|
|
|
- Map<String, JSONObject> temp = JSON.parseObject(JSON.toJSONString(TEMPLATE_DATA),
|
|
|
- new TypeReference<LinkedHashMap<String, JSONObject>>() {
|
|
|
- });
|
|
|
-
|
|
|
List<EmrPatientData> list = dao.getPatientData(patNo, times);
|
|
|
List<JSONObject> tree = new ArrayList<>(list.size());
|
|
|
|
|
@@ -79,6 +76,11 @@ public class EmrServer {
|
|
|
tree();
|
|
|
}
|
|
|
|
|
|
+ Map<String, JSONObject> temp = JSON.parseObject(JSON.toJSONString(TEMPLATE_DATA),
|
|
|
+ new TypeReference<LinkedHashMap<String, JSONObject>>() {
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
list.forEach(item -> {
|
|
|
JSONObject js = temp.get(item.getParent());
|
|
|
|
|
@@ -247,9 +249,18 @@ public class EmrServer {
|
|
|
param.setCreateId(TokenUtil.getTokenUserId());
|
|
|
boolean isUpdated = dao.whetherThereIsAMedicalRecord(param.getEmrDocumentId()).equals(1);
|
|
|
Map<String, Object> extractedData = extractDataElement(param);
|
|
|
+
|
|
|
+
|
|
|
if (isUpdated) {
|
|
|
dao.updateCreatedTemplate(param);
|
|
|
} else {
|
|
|
+ // 新增的时候插入数据
|
|
|
+ ZyPatientInfo patInfo = publicServer.getPatInfo(param.getPatNo(), param.getTimes());
|
|
|
+
|
|
|
+ param.setReferPhysician(patInfo.getReferPhysician())
|
|
|
+ .setConsultPhysician(patInfo.getConsultPhysician())
|
|
|
+ .setDeptDirector(patInfo.getDeptDirector());
|
|
|
+
|
|
|
param.setParent(GROUP_MAP.get(param.getEmrCategoryCode()));
|
|
|
dao.emrInsertForTheFirstTime(param);
|
|
|
}
|