From 4d537968ac6efb3a5e3d0f8ea5071d5254eb63c3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 29 七月 2025 14:37:17 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 302 +++++++++++---------------------------------------
1 files changed, 66 insertions(+), 236 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 147be1d..771bf63 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -87,7 +87,7 @@
private IServicePatientTempService iServicePatientTempService;
@Autowired
- private PlatformTransactionManager transactionManager;
+ private IHNGatherPatArchiveService ihnGatherPatArchiveService;
@Autowired
private SysUserImportMapper sysUserImportMapper;
@@ -125,8 +125,6 @@
@Autowired
IPatArchiveService patArchiveService;
- @Autowired
- IPatMedInhospService patMedInhospService;
@Autowired
IPatMedOuthospService patMedOuthospService;
@@ -137,14 +135,19 @@
@Autowired
IIvrTaskTemplateService iIvrTaskTemplateService;
- @Value("${hosp_info_url}")
- private String hospInfoUrl;
+ @Autowired
+ IXHGatherPatArchiveService ixhGatherPatArchiveService;
+
@Value("${appid}")
private String appid;
@Value("${server.port}")
private String port;
+
+
+ @Value("${spring.profiles.active}")
+ private String active;
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
@@ -206,31 +209,49 @@
/**
- * 澶勭悊his鏁版嵁
+ * 澶勭悊HIS鏁版嵁閲囬泦
+ * 瀹氭椂浠诲姟锛氶噰闆嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹�
*/
public void dealHisData() {
- //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
- // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
- LocalDateTime endTime = LocalDateTime.now();
- endTime = endTime.with(LocalTime.MIN);
-// String dateStr = "2024/11/30 00:00:00";
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-// LocalDateTime endTime = LocalDateTime.parse(dateStr, formatter);
- // 鑾峰彇鍓嶄竴澶╃殑鏃ユ湡鍜屾椂闂�
- LocalDateTime startTime = endTime.minusDays(1);
- startTime = startTime.with(LocalTime.MIN);
- getInHospInfo("0", startTime, endTime);
- getInHospInfo("1", startTime, endTime);
+ log.info("銆恉ealHisData銆戝紑濮嬫墽琛孒IS鏁版嵁閲囬泦浠诲姟");
+ // 鑾峰彇鏄ㄥぉ0鐐瑰埌浠婂ぉ0鐐圭殑鏃堕棿鑼冨洿
+ LocalDateTime todayZero = LocalDateTime.now().with(LocalTime.MIN);
+ LocalDateTime yesterdayZero = todayZero.minusDays(1);
+ log.info("銆恉ealHisData銆戦噰闆嗘椂闂磋寖鍥达細{} ~ {}", yesterdayZero, todayZero);
- //璋冪敤dealOupHospInfo鏁版嵁澶勭悊鏂规硶锛屽鐞嗗畬鍚庯紝灏嗏�滃嚭闄㈣〃鐨刢heck_flag=1鈥�
- //鑾峰彇褰撳墠鏃ユ湡 锛堢簿纭埌澶╋級寰�鍓嶆帹鐩稿簲澶╂暟锛堝湪鎸囧畾鐨勫熀纭�妯℃澘涓壘瀵瑰簲鐨勫ぉ鏁帮級锛�
- //寰幆鎮ｈ�呬俊鎭紝鏍规嵁鎮ｈ��"鍑洪櫌璇婃柇ICD鍊尖�濊幏鍙栧埌鐩稿綋鐨勬ā鏉匡紙鑾峰彇鍙栫浉搴旂殑澶╂暟锛�;
- //鏍规嵁鏌ヨ鍑烘潵鐨勬ā鏉匡紝鍘诲浐瀹氫换鍔★紙鍥哄畾浠诲姟锛屽凡缁忓皢妯℃澘涔熷浐瀹氫簡锛夊幓鍖归厤妯℃澘
- //鏍规嵁鍖归厤鍑烘潵鐨勬ā鏉垮拰浠诲姟涓庢偅鑰呬俊鎭紝灏嗘暟鎹彃鍏ュ埌瀛愪换鍔¤〃涓�
+ if (active.trim().equals("xh")) {
+ try {
+ // 閲囬泦鍏ラ櫌鏁版嵁
+ log.info("銆恉ealHisData銆戞柊鍗庡紑濮嬮噰闆嗗叆闄㈡暟鎹�");
+ ixhGatherPatArchiveService.getInHospDataGather("0", yesterdayZero, todayZero);
+ log.info("銆恉ealHisData銆戞柊鍗庡叆闄㈡暟鎹噰闆嗗畬鎴�");
+
+ // 閲囬泦鍑洪櫌鏁版嵁
+ log.info("銆恉ealHisData銆戞柊鍗庡紑濮嬮噰闆嗗嚭闄㈡暟鎹�");
+ ixhGatherPatArchiveService.getInHospDataGather("1", yesterdayZero, todayZero);
+ log.info("銆恉ealHisData銆戞柊鍗庡嚭闄㈡暟鎹噰闆嗗畬鎴�");
+
+ } catch (Exception e) {
+ log.error("銆恉ealHisData銆戞柊鍗庢暟鎹噰闆嗗紓甯�", e);
+ }
+ } else if (active.trim().equals("hn")) {
+ try {
+ // 娌冲崡鏁版嵁閲囬泦
+ HnDataGatherVO hnDataGatherVO = new HnDataGatherVO();
+ log.info("銆恉ealHisData銆戞渤鍗楀紑濮嬮噰闆嗘暟鎹�");
+ ihnGatherPatArchiveService.hnDataGather(hnDataGatherVO);
+ log.info("銆恉ealHisData銆戞渤鍗楃粨鏉熼噰闆嗘暟鎹�");
+ } catch (Exception e) {
+ log.error("銆恉ealHisData銆戞渤鍗楁暟鎹噰闆嗗紓甯�", e);
+ }
+ }
}
+ /**
+ * 杩欎釜鍙槸鏂板崕涓存椂浣跨敤锛屽钩鏃剁敤涓嶅埌
+ */
public void dealHisData2() {
- //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
+ //灏嗘偅鑰呬俊鎭�佸嚭鍏ラ櫌鏁版嵁鍏ㄩ儴閲囬泦
// 鎸囧畾鐨勫紑濮嬫棩鏈�
LocalDate endDate = LocalDate.of(2025, 3, 3);
// 褰撳墠鏃ユ湡
@@ -241,8 +262,8 @@
// 浠庡紑濮嬫棩鏈熷埌褰撳墠鏃ユ湡閫愬ぉ鎵撳嵃
for (LocalDate date = endDate; !date.isAfter(currentDate); date = date.plusDays(1)) {
System.out.println(date.format(formatter));
- getInHospInfo("0", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
- getInHospInfo("1", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
+ ixhGatherPatArchiveService.getInHospDataGather("0", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
+ ixhGatherPatArchiveService.getInHospDataGather("1", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
}
}
@@ -283,7 +304,7 @@
/**
- * 闀挎湡浠诲姟鎵ц锛堢數璇濓級
+ * 闀挎湡浠诲姟鎵ц
*/
public void longTaskSend() {
//鑾峰彇浠诲姟淇℃伅
@@ -291,7 +312,7 @@
st.setDelFlag("0");
st.setLongTask(1);
List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
- log.error("serviceTasks杩涙潵浜嗗悧锛焮}", serviceTasks);
+ log.info("銆恖ongTaskSend銆戣幏鍙栧埌{}涓暱鏈熶换鍔�", serviceTasks.size());
for (ServiceTask serviceTask : serviceTasks) {
CommonTaskcallMQ commonTaskcallMQ = new CommonTaskcallMQ();
commonTaskcallMQ.setTaskid(serviceTask.getTaskid());
@@ -320,14 +341,14 @@
}
public void sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
- log.error("sfHandlle杩涙潵浜嗗悧锛焮}", commonTaskcallMQ);
+ log.info("銆恠fHandlle銆戝紑濮嬪鐞嗕换鍔★紝浠诲姟ID锛歿}", commonTaskcallMQ.getTaskid());
//鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
ServiceTask ivrTask1 = serviceTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
//濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
String[] split = commonTaskcallMQ.getPreachform().split(",");
- log.error("split杩涙潵浜嗗悧锛焮}", split);
+ log.info("銆恠fHandlle銆戜换鍔″彂閫佹柟寮忥細{}", Arrays.toString(split));
for (String serviceFrom : split) {
String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
//閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
@@ -354,14 +375,14 @@
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
ServiceTask ivrTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 || ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
- //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
+ //濡備綍浠诲姟琚�"鏆傚仠"鎴�"缁堟"
break;
}
if (org.apache.commons.lang3.StringUtils.isEmpty(serviceSubtask.getPhone())) {
serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
serviceSubtask.setSendstate(4L);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
continue;
}
@@ -393,6 +414,7 @@
if (list.size() > 0) {
// redisCache.setCacheListLeft("cache-0", list);
redisCache.setCacheListLeftAndDistinct("cache-0", list);
+ log.info("銆恠fHandlle銆戠數璇濅换鍔″凡鍔犲叆闃熷垪锛屾暟閲忥細{}", list.size());
}
} else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
@@ -400,7 +422,7 @@
//绾歌川
} else if (descByCode.equals("寰俊灏忕▼搴�")) {
//寰俊灏忕▼搴�
- log.error("ivrTask1鐨勫�间负锛歿}", ivrTask1);
+ log.info("銆恠fHandlle銆戝鐞嗗井淇″皬绋嬪簭浠诲姟锛屼换鍔′俊鎭細{}", ivrTask1);
if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) {
//璇存槑璇ヤ换鍔＄殑鎮ｈ�呮槸寰幆鎵ц鐨�
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
@@ -445,7 +467,7 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- log.error("鐭俊闀挎湡浠诲姟鍙戦��---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
+ log.info("銆恠fHandlle銆戝鐞嗙煭淇￠暱鏈熶换鍔★紝鎮ｈ�匢D锛歿}", serviceSubtask.getPatid());
boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
if (dateToday) {
try {
@@ -456,7 +478,7 @@
serviceSubtask.setResult("error");
serviceSubtask.setRemark(patArchive.getNotrequiredreason());
serviceSubtask.setSendstate(4L);
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
continue;
}
@@ -494,13 +516,13 @@
ss.setRemark("鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
- log.error("---------涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
+ log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫侊紝鍦板潃锛歿}锛屽弬鏁帮細{}锛屾満鏋処D锛歿}", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
String dxCode = getDXCode(map.get("address"), sendMagParam.getPhone(), sendMagParam.getContent(), map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()), token);
- log.error("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
+ log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫佺粨鏋滐細{}", dxCode);
ObjectMapper objectMapper = new ObjectMapper();
Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
String code = textParam.get("Code").toString();
@@ -533,23 +555,21 @@
iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
} catch (Exception e) {
String guid = UUID.randomUUID().toString();
- log.error("闀挎湡浠诲姟锛岀煭淇″彂閫佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
+ log.error("銆恠fHandlle銆戦暱鏈熶换鍔＄煭淇″彂閫佸け璐ワ紝鍘熷洜锛歿}锛孏UID锛歿}", e.getMessage(), guid);
serviceSubtask.setResult("error");
serviceSubtask.setRemark("绯荤粺閿欒");
serviceSubtask.setSendstate(5L);
- serviceSubtask.setFinishtime(new Date());
serviceSubtask.setGuid(guid);
iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
}
}
}
} else if (descByCode.equals("鍏紬鍙�")) {
- log.error("鍏紬鍙疯繘鏉ヤ簡鍚楋紵{}", descByCode);
+ log.info("銆恠fHandlle銆戝鐞嗗叕浼楀彿浠诲姟锛屼换鍔′俊鎭細{}", ivrTask1);
//鍏紬鍙�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- log.error("serviceSubtask---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
if (dateToday) {
try {
@@ -560,14 +580,12 @@
serviceSubtask.setResult("error");
serviceSubtask.setRemark(patArchive.getNotrequiredreason());
serviceSubtask.setSendstate(4L);
- serviceSubtask.setFinishtime(new Date());
iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
continue;
}
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
String url = null;
url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
-// String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
//鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
@@ -577,7 +595,6 @@
ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
@@ -588,7 +605,6 @@
ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
@@ -612,7 +628,7 @@
if ((Boolean) map.get("succ") == true) {
serviceSubtask.setResult("success");
} else {
- log.error("serviceSubtask1231313鐨勫�间负锛歿}", serviceSubtask);
+ log.error("銆恠fHandlle銆戝叕浼楀彿鍙戦�佸け璐ワ紝鎮ｈ�呬俊鎭細{}锛岄敊璇俊鎭細{}", serviceSubtask, map.get("msg"));
serviceSubtask.setResult("error");
serviceSubtask.setSendstate(5L);
serviceSubtask.setRemark(map.get("msg").toString());
@@ -620,11 +636,10 @@
iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
} catch (Exception e) {
String guid = UUID.randomUUID().toString();
- log.error("闀挎湡浠诲姟锛屽叕浼楀彿鍙戦�佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
+ log.error("銆恠fHandlle銆戦暱鏈熶换鍔″叕浼楀彿鍙戦�佸け璐ワ紝鍘熷洜锛歿}锛孏UID锛歿}", e.getMessage(), guid);
serviceSubtask.setResult("error");
serviceSubtask.setRemark("绯荤粺閿欒");
serviceSubtask.setSendstate(5L);
- serviceSubtask.setFinishtime(new Date());
serviceSubtask.setGuid(guid);
iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
}
@@ -635,191 +650,6 @@
}
}
}
-
-
- /**
- * 鑾峰嚭闄㈡偅鑰呬俊鎭�
- * cry 鍑哄叆闄細 0 鍏ラ櫌 1 鍑洪櫌
- */
- @Transactional
- public void getInHospInfo(String cry, LocalDateTime startTime, LocalDateTime endTime) {
- // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S");
- Map<String, String> req = new HashMap<>();
- if (cry.equals("1")) {
- req.put("cashStartDate", startTime.format(formatter));
- req.put("cashEndDate", endTime.format(formatter));
- req.put("currStatus", "4");
- } else if (cry.equals("0")) {
- req.put("admissStartDate", startTime.format(formatter));
- req.put("admissEndDate", endTime.format(formatter));
- req.put("currStatus", "2");
- }
- Map<String, String> header = new HashMap<>();
- header.put("x-hcsb-serviceno", "IS002347");
- header.put("x-hcsb-version", "2.0");
- header.put("x-hcsb-sourcesyscode", "14");
- header.put("x-hcsb-token", "ArGE2JnHtxG/Zx5nrnGY4eOfMUJGGJokAJHigG1BrCY=");
- header.put("x-hcsb-msgdate", startTime.format(formatter));
- String result = HttpUtils.sendPostByHeader(hospInfoUrl, new Gson().toJson(req), header);
- //鏁版嵁瑙ｆ瀽
- Gson gson = new Gson();
- JsonObject jsonObject = gson.fromJson(result, JsonObject.class);
- JsonArray resultArray = jsonObject.getAsJsonObject("data").getAsJsonArray("result");
- Type resultType = new TypeToken<List<ThiedInhospInfo>>() {
- }.getType();
- List<ThiedInhospInfo> thiedInhospInfoList = gson.fromJson(resultArray, resultType);
-
- // 鍒涘缓涓�涓柊鏂囦欢
- String filename = null;
- if (cry.equals("0")) filename = "鍏ラ櫌淇℃伅" + System.currentTimeMillis();
- if (cry.equals("1")) filename = "鍑洪櫌淇℃伅" + System.currentTimeMillis();
- File file = new File("D:\\public\\HIS鏁版嵁閲囬泦\\" + filename);
- if (!file.exists()) {
- // 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欏垱寤烘柊鏂囦欢
- try {
- if (file.createNewFile()) {
- System.out.println("鎴愬姛鍒涘缓浜嗘柊鏂囦欢!");
- } else {
- System.out.println("澶辫触锛佹枃浠舵棤娉曞垱寤猴紒");
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- // 灏嗘暟鎹啓鍏ュ埌鏂囦欢涓�
- try {
- FileWriter writer = new FileWriter(file);
- writer.write(result);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- if (CollectionUtils.isNotEmpty(thiedInhospInfoList)) {
- for (ThiedInhospInfo thiedInhospInfo : thiedInhospInfoList) {
- //閫氳繃韬唤璇佸彿鏌ヨ璇ユ偅鑰呭湪鎮ｈ�呰〃鏄惁瀛樺湪
- PatArchive patArchive = new PatArchive();
- List<PatArchive> patArchives = null;
- patArchive.setIdcardno(thiedInhospInfo.getPatiIdCardNo().trim());
- if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiIdCardNo().trim())) {
- patArchives = patArchiveService.selectPatArchiveList(patArchive);
- } else {
- //鎮ｈ�呬俊鎭负绌猴紝鐩存帴 涓嬩竴涓�
- continue;
- }
- if (CollectionUtils.isEmpty(patArchives) || patArchives.size() == 0) {
- patArchive.setPatientno(thiedInhospInfo.getPatiMediaNo());
- patArchive.setSourcefrom(2);
- patArchive.setPattype("2");
- if (StringUtils.isNotEmpty(thiedInhospInfo.getOutWayId()) && thiedInhospInfo.getOutWayId().equals("4")) {
- //濡傛灉涓�4灏辨槸姝讳骸
- patArchive.setNotrequiredFlag("1");
- patArchive.setNotrequiredreason(thiedInhospInfo.getOutWayName());
- }
- if (cry.equals("1") && StringUtils.isEmpty(thiedInhospInfo.getOutWayId())) {
- //濡傛灉涓�4灏辨槸姝讳骸
- patArchive.setNotrequiredFlag("1");
- patArchive.setNotrequiredreason("鍑洪櫌鏂瑰紡涓虹┖");
- }
- patArchive.setSex(thiedInhospInfo.getPatiRecordGender().equals("鐢�") ? 1L : 2L);
- patArchive.setNation(thiedInhospInfo.getPatiNation());
- patArchive.setNativePlace(thiedInhospInfo.getPatiNationality());
- patArchive.setPlaceOfResidence(StringUtils.isNotEmpty(thiedInhospInfo.getPatiHomeAddr()) ? thiedInhospInfo.getPatiHomeAddr().replace("null", "") : "");
- try {
- if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiBirthday()))
- patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd").parse(thiedInhospInfo.getPatiBirthday()));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- if (thiedInhospInfo.getTreateAge() != null) {
- patArchive.setAge(Long.valueOf(thiedInhospInfo.getTreateAge()));
- } else {
- patArchive.setAge(null);
- }
- patArchive.setAgeUnit(thiedInhospInfo.getTreatAgeunit());
- patArchive.setTelcode(thiedInhospInfo.getCompanyTelNum());
- patArchive.setRelativetelcode(thiedInhospInfo.getContactPersonPhone());
- patArchive.setDelFlag("0");
- patArchive.setCreateTime(new Date());
- patArchive.setUpdateTime(new Date());
- patArchive.setName(thiedInhospInfo.getPatiRecordName());
- patArchiveService.insertPatArchive(patArchive);
- } else {
- patArchive = patArchives.get(0);
- }
-
- log.error("鍏ュ弬鐨刾atArchive锛歿}", patArchive);
- PatMedInhosp patMedInhosp = new PatMedInhosp();
- patMedInhosp.setPatid(patArchive.getId());
- patMedInhosp.setPatno(patArchive.getPatientno());
- patMedInhosp.setPatname(patArchive.getName());
- patMedInhosp.setNurseId(thiedInhospInfo.getNurseId());
- patMedInhosp.setNurseName(thiedInhospInfo.getNurseName());
- patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId());
- patMedInhosp.setFuflag("1");
- if (cry.equals("0")) {
- patMedInhosp.setInhospstate("0");
- } else if (cry.equals("1")) {
- patMedInhosp.setInhospstate("1");
- }
- patMedInhosp.setHospitalcode(thiedInhospInfo.getAreaId());
- patMedInhosp.setIcd10code(thiedInhospInfo.getDiagIcd10());
- patMedInhosp.setDiagname(thiedInhospInfo.getDiagName());
- try {
- if (StringUtils.isNotEmpty(thiedInhospInfo.getAdmissDate()))
- patMedInhosp.setStarttime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getAdmissDate()));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- try {
- if (StringUtils.isNotEmpty(thiedInhospInfo.getOutDate()))
- patMedInhosp.setEndtime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getOutDate()));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- patMedInhosp.setDeptcode(thiedInhospInfo.getAdmissDeptId());
- patMedInhosp.setDeptid(thiedInhospInfo.getAdmissDeptId());
- patMedInhosp.setDeptname(thiedInhospInfo.getAdmissDeptName());
- patMedInhosp.setBedNo(thiedInhospInfo.getAdmissBedNo());
- patMedInhosp.setDelFlag("0");
-// patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptCode());
- patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptId());
- patMedInhosp.setLeaveldeptname(thiedInhospInfo.getCurrDeptName());
- patMedInhosp.setLeavediagname(thiedInhospInfo.getDiagName());
- patMedInhosp.setLeaveicd10code(thiedInhospInfo.getDiagIcd10());
- patMedInhosp.setDrname(thiedInhospInfo.getDoctName());
- patMedInhosp.setDrcode(thiedInhospInfo.getDoctId());
- patMedInhosp.setOutWayId(thiedInhospInfo.getOutWayId());
- patMedInhosp.setOutWayName(thiedInhospInfo.getOutWayName());
- if (cry.equals("0")) {
- patMedInhosp.setSchemestatus(1L);
- } else if (cry.equals("1")) {
- patMedInhosp.setSchemestatus(2L);
- }
- patMedInhosp.setLeavehospitaldistrictid(thiedInhospInfo.getCurrWardCode());
- patMedInhosp.setLeavehospitaldistrictcode(thiedInhospInfo.getCurrWardId());
- patMedInhosp.setLeavehospitaldistrictname(thiedInhospInfo.getCurrWardName());
- patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptCode());
- patMedInhosp.setOrgid("1");
- //濡傛灉鏄嚭闄紝鍏堥�氳繃鎮ｈ�呯紪鍙峰拰娴佹按鍙峰幓鏌ヤ竴涓嬶紝鎮ｈ�呮槸鍚﹀瓨鍦紝濡傛灉瀛樺湪锛屽垯杩涜淇敼
- PatMedInhosp inhosp = new PatMedInhosp();
- inhosp.setPatno(patArchive.getPatientno());
- inhosp.setSerialnum(patMedInhosp.getSerialnum());
- List<PatMedInhosp> patMedInhosps = patMedInhospService.selectPatMedInhospList(inhosp);
- log.error("鏄惁闇�瑕佹洿鏂帮細{}", patMedInhosps.size());
- if (CollectionUtils.isNotEmpty(patMedInhosps)) {
- patMedInhosp.setInhospid(patMedInhosps.get(0).getInhospid());
- log.error("------鎮ｈ�呭嚭鍏ラ櫌淇敼淇℃伅锛歿}", patMedInhosp);
- patMedInhospService.updatePatMedInhosp(patMedInhosp);
- } else {
- log.error("----鎮ｈ�呭嚭鍏ラ櫌鏂板淇℃伅锛歿}", patMedInhosp);
- patMedInhospService.insertPatMedInhosp(patMedInhosp);
- }
-
- }
- }
- }
-
private String getKey() {
Map<String, String> map = new HashMap<>();
@@ -872,7 +702,7 @@
} catch (IOException e) {
e.printStackTrace();
}
- log.error("--------result鐨勫�间负锛歿}-----", result);
+ log.info("銆恎etDXCode銆戠煭淇″彂閫佺粨鏋滐細{}", result);
JSONObject jsonObject = JSONObject.parseObject(result);
String code = (String) jsonObject.toString();
@@ -891,7 +721,7 @@
xinHuaWXReq.setTitlename(taskName);
xinHuaWXReq.setContent(taskDesc);
xinHuaWXReq.setAppid(wxqqxx.get(1));
- log.error("----getWXCode---xinHuaWXReq鐨勫嚭鍙備负锛歿}", xinHuaWXReq);
+ log.info("銆恎etWXCode銆戝井淇″叕浼楀彿璇锋眰鍙傛暟锛歿}", xinHuaWXReq);
String body = new Gson().toJson(xinHuaWXReq);
String encode = encode(wxqqxx.get(2).concat(body));
Map<String, String> headerMap = new HashMap<>();
--
Gitblit v1.9.3