diff --git a/src/main/java/com/example/duplicate/controller/vo/TscanAssortVo.java b/src/main/java/com/example/duplicate/controller/vo/TscanAssortVo.java index e7f3c7b..b225587 100644 --- a/src/main/java/com/example/duplicate/controller/vo/TscanAssortVo.java +++ b/src/main/java/com/example/duplicate/controller/vo/TscanAssortVo.java @@ -16,4 +16,5 @@ public class TscanAssortVo { private String scanPage; //分段id private String assortId; + //分段名称 } diff --git a/src/main/java/com/example/duplicate/service/impl/MedicalAdviceServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/MedicalAdviceServiceImpl.java index c3604c5..48b4051 100644 --- a/src/main/java/com/example/duplicate/service/impl/MedicalAdviceServiceImpl.java +++ b/src/main/java/com/example/duplicate/service/impl/MedicalAdviceServiceImpl.java @@ -114,12 +114,13 @@ public class MedicalAdviceServiceImpl implements MedicalAdviceService { List files = getFiles(list, scanPages); MultipartEntityBuilder builder = MultipartEntityBuilder.create(); /* 公共文本参数 */ - builder.addPart("recordTypeId", new StringBody("413687918421381", ContentType.TEXT_PLAIN)); - builder.addPart("planId", new StringBody("417408389604741", ContentType.TEXT_PLAIN)); + builder.addPart("recordTypeId", new StringBody("570957355565765", ContentType.TEXT_PLAIN)); + builder.addPart("planId", new StringBody("570957652034245", ContentType.TEXT_PLAIN)); builder.addPart("operateType", new StringBody("insert", ContentType.TEXT_PLAIN)); builder.addPart("storeWay", new StringBody("1", ContentType.TEXT_PLAIN)); builder.addPart("dataType", new StringBody("2", ContentType.TEXT_PLAIN)); builder.addPart("origin", new StringBody("999", ContentType.TEXT_PLAIN)); + builder.addPart("realOrigin", new StringBody("999", ContentType.TEXT_PLAIN)); /* 循环塞文件 */ for (int i = 0; i < files.size(); i++) { FileMeta m = files.get(i); @@ -133,26 +134,12 @@ public class MedicalAdviceServiceImpl implements MedicalAdviceService { new StringBody(m.getFileNo(), ContentType.TEXT_PLAIN)); builder.addPart("fileInfoReqList[" + i + "].catalogueName", new StringBody(m.getCatalogueName(), ContentType.TEXT_PLAIN)); + builder.addPart("repoPositionList[0]", + new StringBody("570956235612869", ContentType.TEXT_PLAIN)); } /* 3. 构建实体并发送 */ HttpEntity entity = builder.build(); - // 打印实体内容 - for (int i = 0; i < files.size(); i++) { - FileMeta m = files.get(i); - System.out.println("---- 第 " + i + " 个文件 非文件字段 ----"); - System.out.println("recordTypeId = 413687918421381"); - System.out.println("planId = 417408389604741"); - System.out.println("operateType = insert"); - System.out.println("storeWay = 1"); - System.out.println("dataType = 2"); - System.out.println("origin = 999"); - System.out.println("fileInfoReqList[" + i + "].patientId = " + m.getPatientId()); - System.out.println("fileInfoReqList[" + i + "].uniqueIdentifier = " + m.getUniqueIdentifier()); - System.out.println("fileInfoReqList[" + i + "].fileNo = " + m.getFileNo()); - System.out.println("fileInfoReqList[" + i + "].catalogueName = " + m.getCatalogueName()); - /* 文件本身不打印 */ - } HttpPost post = new HttpPost(emrUploadURL); post.setHeader("appId", APP_ID); post.setHeader("accessKey", ACCESS_KEY); @@ -187,7 +174,132 @@ public class MedicalAdviceServiceImpl implements MedicalAdviceService { List files = new ArrayList<>(); //组织文件信息集合 for (TscanAssortVo scanPage: scanPages){ - files.add(new FileMeta(list.getFilePath()+ File.separatorChar+scanPage.getScanPage(), list.getPatientId(), list.getPatientId(),getID(),scanPage.getAssortId())); + String sort = scanPage.getAssortId(); + //病案首页 + if ("1".equals(sort) || "101".equals(sort) || "1001".equals(sort)) { + scanPage.setAssortId("549558051292549"); + } + //入院记录 + if ("3".equals(sort) || "102".equals(sort) || "1002".equals(sort)) { + scanPage.setAssortId("568112436233605"); + } + //· + if ("4".equals(sort) || "103".equals(sort) || "1003".equals(sort)) { + scanPage.setAssortId("575237977484741"); + } + //术前讨论记录 + if ("1004".equals(sort)) { + scanPage.setAssortId("575238638931397"); + } + //手术记录 + if ("6".equals(sort) || "104".equals(sort) || "1011".equals(sort)) { + scanPage.setAssortId("575238585404869"); + } + //术后病程记录 + if ("1013".equals(sort)) { + scanPage.setAssortId("575238689820101"); + } + //出院记录 + if ("2".equals(sort) || "105".equals(sort) || "1014".equals(sort)) { + scanPage.setAssortId("575238760009157"); + } + //死亡记录 + if ("106".equals(sort) || "1015".equals(sort)) { + scanPage.setAssortId("575238821932485"); + } + //死亡病例讨论记录 + if ("1016".equals(sort)) { + scanPage.setAssortId("575238894874053"); + } + //会诊记录 + if ("11".equals(sort) || "107".equals(sort) || "1019".equals(sort)) { + scanPage.setAssortId("575238996749765"); + } + //辅助检查报告单 + if ("109".equals(sort) || "1022".equals(sort)) { + scanPage.setAssortId("575239051513285"); + } + //医学影像检查资料 + if ("8".equals(sort) || "110".equals(sort) || "1023".equals(sort)) { + scanPage.setAssortId("575239110995397"); + } + //医嘱单 + if ("14".equals(sort) || "111".equals(sort) || "1025".equals(sort)) { + scanPage.setAssortId("575239174942149"); + } + //手术同意书 + if ("10".equals(sort) || "1005".equals(sort) || "112".equals(sort)) { + scanPage.setAssortId("575241736244677"); + } + //麻醉同意书 + if ("113".equals(sort) || "1006".equals(sort) ) { + scanPage.setAssortId("575241797955013"); + } + //麻醉术前访视记录 + if ("114".equals(sort) || "1007".equals(sort) ) { + scanPage.setAssortId("575241937251781"); + } + //手术安全核查记录 + if ("115".equals(sort) || "1008".equals(sort) ) { + scanPage.setAssortId("575242022112709"); + } + //手术清点记录 + if ("116".equals(sort) || "1009".equals(sort)) { + scanPage.setAssortId("575242144411077"); + } + //麻醉记录 + if ("5".equals(sort) || "117".equals(sort) || "1010".equals(sort)) { + scanPage.setAssortId("575242591022533"); + } + //麻醉术后访视记录 + if ("118".equals(sort) || "1012".equals(sort)) { + scanPage.setAssortId("575242662833605"); + } + //输血治疗知情同意书 + if ("119".equals(sort) || "1017".equals(sort)) { + scanPage.setAssortId("575242909740485"); + } + //特殊检查(·)同意书 + if ("120".equals(sort) || "1018".equals(sort)) { + scanPage.setAssortId("575243033488837"); + } + //病危(重)通知书 + if ("121".equals(sort) || "1020".equals(sort) ) { + scanPage.setAssortId("575243310140869"); + } + //护理记录单 + if ("13".equals(sort) || "12".equals(sort)) { + scanPage.setAssortId("575243495132613"); + } + //体温单 + if ("15".equals(sort) || "122".equals(sort) || "1024".equals(sort)) { + scanPage.setAssortId("575243539328453"); + } + //病重(病危)患者护理记录 + if ("123".equals(sort) || "1026".equals(sort)) { + scanPage.setAssortId("575243749731781"); + } + //其他 + if ("16".equals(sort) || "125".equals(sort)|| "1028".equals(sort)) { + scanPage.setAssortId("575243792223685"); + } + //费用结算清单 + if ("124".equals(sort) || "1027".equals(sort)) { + scanPage.setAssortId("575243853565381"); + } + //新生儿记录 + if ("17".equals(sort)) { + scanPage.setAssortId("579386395463109"); + } + //特殊治疗 + if ("9".equals(sort)) { + scanPage.setAssortId("579389947506117"); + } + files.add(new FileMeta(list.getFilePath()+ File.separatorChar+scanPage.getScanPage(), + list.getPatientId(), + list.getPatientId(), + getID(), + scanPage.getAssortId())); } return files; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cab5a3a..a81727a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,9 +3,9 @@ server: spring: datasource: - url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=gm_record + url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=xyferecord username: sa - password: admin123 + password: xjgs+docus911 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=gm_record # username: sa # password: admin123 @@ -32,7 +32,7 @@ logging: #网关 -DOMAIN_URL : http://demo.zoyheal.com:30080/plss/prod-api +DOMAIN_URL : http://172.27.201.116:30080/plss/prod-api #应用标识id APP_ID : 457789320062469 #公钥