From 02fc34a5283d43cf0aef9265123cf2f2dfac10a0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 10 七月 2024 18:08:38 +0800
Subject: [PATCH] zjh 2024/07/10-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java | 36 +++++++
ltkj-admin/src/main/resources/application-test.yml | 2
ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java | 24 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 38 +++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java | 17 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 6 +
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 86 +++++++++++++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java | 30 ++++++
11 files changed, 232 insertions(+), 14 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 4d57bb4..48071e9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -59,6 +59,8 @@
private LtkjMxjfxmzdService ltkjMxjfxmzdService;
@Autowired
private LtkjEjjfxmzdService ltkjEjjfxmzdService;
+ @Autowired
+ private TjCfService cfService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -179,6 +181,7 @@
dto.setSfjz("0");
List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
+ List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
if (null != detailList && detailList.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
@@ -198,6 +201,17 @@
}
detailsDto.setSl(project.getSl());
detailsDtos.add(detailsDto);
+ }
+ if(project.getProId()==1740177341251154377L){
+ OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+ detilsDto.setYpbm("00006670");
+ detilsDto.setPcbm("1");
+ detilsDto.setSl(1);
+ detilsDto.setDj(60);
+ detilsDto.setDcjl(1);
+ detilsDto.setPj(60);
+ detilsDto.setJj(60);
+ outpinmedicapplyDetilsDtos.add(detilsDto);
}
}
}
@@ -249,18 +263,50 @@
}
ltkjJianchajianyanTreeService.save(tree);
}
-// Map<String, Object> datas = object3.getJSONObject("ResultData");
-// datas.put("cardId", customer.getCardId());
-// JSONObject object4 = JSONUtil.parseObj(datas);
-// LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-// lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintestapply");
-// HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
-// hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dto)));
-
}
-// else {
-// return AjaxResult.error("妫�楠岀敵璇峰け璐�!");
-// }
+ }
+
+ //鑽搧鐢宠
+ if(outpinmedicapplyDetilsDtos.size()>0){
+ OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
+ dto1.setHisRegistrationId(customer.getCardId());
+ dto1.setSfzh(customer.getCusIdcard());
+ dto1.setSqysbm("00029");
+ dto1.setMzksbm("0101");
+ dto1.setSjrq(date);
+ dto1.setCzybm("00029");
+ dto1.setCzyksbm("0101");
+ dto1.setDetails(outpinmedicapplyDetilsDtos);
+ AjaxResult result = controller.Outpinmedicapply(dto1);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(null !=code && code.equals("200")){
+ JSONArray resultData = object.getJSONArray("ResultData");
+ Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
+ String cfh = resultDatasss.get("cfh").toString();
+
+ for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+ TjCf cf=new TjCf();
+ cf.setCardId(customer.getCardId());
+ cf.setSfzh(customer.getCusIdcard());
+ cf.setCfh(cfh);
+ cf.setSqysbm("00029");
+ cf.setSqysxm("鐜嬪仴钀�");
+ cf.setMzksbn("0101");
+ cf.setSqrq(date);
+ cf.setCzybm("00029");
+ cf.setYpbm(detilsDto.getYpbm());
+ cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅");
+ cf.setSl(String.valueOf(detilsDto.getSl()));
+ cf.setDj(String.valueOf(detilsDto.getDj()));
+ cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+ cf.setPj(String.valueOf(detilsDto.getPj()));
+ cf.setJj(String.valueOf(detilsDto.getJj()));
+ cf.setCreateTime(new Date());
+ cfService.save(cf);
+ }
+ }
}
//闂ㄨ瘖妫�鏌ョ敵璇�
@@ -472,6 +518,9 @@
List<String> zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
+
+ List<String> cfhs = cfService.getCfhs(order.getCardId());
+
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
if (null != jcsqdh && jcsqdh.size()>0) {
for (String s : jcsqdh) {
@@ -524,6 +573,21 @@
// }
}
}
+
+ //浣滃簾鑽搧鐢宠
+ if(null !=cfhs && cfhs.size()>0){
+ for (String cfh : cfhs) {
+ AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(null !=code && code.equals("200")){
+ cfService.delCfByCardId(cfh);
+ }
+ }
+ }
+
+
//2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029");
result2 = getAjaxResult(ajaxResult);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index ded9154..7dd7d38 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -517,6 +517,12 @@
if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());
+ if(null !=objectMap.get("JCBW") || !objectMap.get("JCBW").equals(""))
+ jcbgd.setJcbw(objectMap.get("JCBW").toString());
+
+ if(null !=objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
+ jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
+
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index e1a46c6..41ecea5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -48,6 +48,7 @@
import com.ltkj.hosp.dto.QianDaoDto;
import com.ltkj.hosp.dto.TjProBlDto;
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
+import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
@@ -197,6 +198,20 @@
private TjProBlService blService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+
+ @Autowired
+ private TjCfService cfService;
+
+ //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
+ public JSONObject getJSONObject(String builder) {
+ String Response = JSONUtil.parseObj(builder).getStr("Response");
+ return JSONUtil.parseObj(Response);
+ }
+
+ //鑾峰彇鏂规硶杩斿洖鍊间俊鎭�
+ public String getAjaxResult(AjaxResult result) {
+ return result.get("data").toString();
+ }
/**
* 鏌ヨ浣撴璁板綍鍒楄〃
@@ -2830,5 +2845,28 @@
}
return AjaxResult.error();
}
+
+
+ @PostMapping("/addYaoPinShenQing")
+ @ApiOperation(value = "鑽搧淇℃伅鐢宠")
+ @Transactional
+ public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto){
+ AjaxResult result = controller.Outpinmedicapply(dto);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(null !=code && code.equals("200")){
+
+ }
+ return AjaxResult.success();
+ }
+
+
+
+
+
+
+
+
}
diff --git a/ltkj-admin/src/main/resources/application-test.yml b/ltkj-admin/src/main/resources/application-test.yml
index d738ceb..d60ccb7 100644
--- a/ltkj-admin/src/main/resources/application-test.yml
+++ b/ltkj-admin/src/main/resources/application-test.yml
@@ -238,5 +238,5 @@
# username = root
# password = Root_ltkj123
config:
- properties: D:\ltkjprojectconf\config.properties1
+ properties: D:\ltkjprojectconf\config1.properties
path: D:\ltkjprojectconf
\ No newline at end of file
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
index 78a3af4..f83f875 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
@@ -89,6 +89,7 @@
fileWriter.write("password = 浣犵殑涓绘暟鎹簱杩炴帴瀵嗙爜\n");
fileWriter.write("redisIp = 浣犵殑redisIp鍦板潃");
fileWriter.write("redisProt = 浣犵殑redis绔彛");
+ fileWriter.write("redisIpDatabase = 浣犵殑redis閾炬帴搴�");
fileWriter.write("redisPassword = 浣犵殑redis瀵嗙爜");
fileWriter.write("");
fileWriter.close();
@@ -109,7 +110,7 @@
// 濡傛灉闇�瑕佸瘑鐮侀獙璇侊紝璁剧疆瀵嗙爜
factory.setPassword(props.getProperty("redisPassword"));
// 璁剧疆鍏朵粬鍙傛暟锛屽鏁版嵁搴撶储寮曠瓑
- factory.setDatabase(0);
+ factory.setDatabase(Integer.parseInt(props.getProperty("redisIpDatabase")));
// 鏈�鍚庯紝鍒濆鍖栬繛鎺�
factory.afterPropertiesSet();
log.info("redis杩炴帴鎴愬姛!!!");
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java
new file mode 100644
index 0000000..85b6936
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java
@@ -0,0 +1,36 @@
+package com.ltkj.hosp.domain;/*
+ * @Authot:zjh
+ * @Date: 2024-07-10 15:43
+ * */
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TjCf {
+ @TableId(type = IdType.AUTO)
+ private Long id;
+ private String cardId;
+ private String sfzh;
+ private String cfh;
+ private String sqysbm;
+ private String sqysxm;
+ private String mzksbn;
+ private String sqrq;
+ private String czybm;
+ private String czyxm;
+ private String czksbm;
+ private String ypbm;
+ private String ypmc;
+ private String pcbm;
+ private String sl;
+ private String dj;
+ private String dcjl;
+ private String pj;
+ private String jj;
+ private Date createTime;
+
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 7e5306f..d3fe8bf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -32,6 +32,6 @@
@Insert("INSERT INTO ltkj_exam_jcsqd \n" +
"SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
"a.yxzd jgzt,a.yxbx jgbx\n" +
- "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.tmh")
+ "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
void saveLtkjExamJcsqd(String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java
new file mode 100644
index 0000000..dd5895b
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java
@@ -0,0 +1,24 @@
+package com.ltkj.hosp.mapper;/*
+ * @Authot:zjh
+ * @Date: 2024-07-10 15:45
+ * */
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjCf;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Mapper
+public interface TjCfMapper extends BaseMapper<TjCf> {
+
+ @Delete("DELETE FROM tj_cf WHERE cfh=#{cfh}")
+ void delCfByCardId(String cfh);
+
+
+ @Select("SELECT a.cfh FROM tj_cf a WHERE a.card_id=#{cardId}")
+ List<String> getCfhs(String cardId);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java
new file mode 100644
index 0000000..acc098d
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java
@@ -0,0 +1,17 @@
+package com.ltkj.hosp.service;/*
+ * @Authot:zjh
+ * @Date: 2024-07-10 15:46
+ * */
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjCf;
+
+import java.util.List;
+
+public interface TjCfService extends IService<TjCf> {
+
+
+ void delCfByCardId(String cfh);
+
+ List<String> getCfhs(String cardId);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java
new file mode 100644
index 0000000..3725f93
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java
@@ -0,0 +1,30 @@
+package com.ltkj.hosp.service.impl;/*
+ * @Authot:zjh
+ * @Date: 2024-07-10 15:47
+ * */
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjCf;
+import com.ltkj.hosp.mapper.TjCfMapper;
+import com.ltkj.hosp.service.TjCfService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class TjCfServiceImpl extends ServiceImpl<TjCfMapper, TjCf> implements TjCfService {
+
+ @Resource
+ private TjCfMapper mapper;
+
+ @Override
+ public void delCfByCardId(String cfh) {
+ mapper.delCfByCardId(cfh);
+ }
+
+ @Override
+ public List<String> getCfhs(String cardId) {
+ return mapper.getCfhs(cardId);
+ }
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
index c2bb7ac..12fed30 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
@@ -29,4 +29,6 @@
private String yxzd;
private String yxbx;
private String zdsj;
+ private String sqsj;
+ private String jcbw;
}
--
Gitblit v1.8.0