From 201e9ae76d2c8d6219ceabbf4e1ebb36fc2e7a06 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 11 七月 2024 18:18:23 +0800
Subject: [PATCH] zjh 2024/07/11-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java | 16 ++++++++--------
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 5 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 10 +++++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 6 +++---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 14 ++++++++------
ltkj-admin/src/main/resources/application.yml | 2 +-
6 files changed, 32 insertions(+), 21 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 48071e9..f13d349 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
@@ -205,12 +205,12 @@
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);
+ detilsDto.setPcbm("06");
+ detilsDto.setSl("1");
+ detilsDto.setDj("60");
+ detilsDto.setDcjl("1");
+ detilsDto.setPj("60");
+ detilsDto.setJj("60");
outpinmedicapplyDetilsDtos.add(detilsDto);
}
}
@@ -276,6 +276,8 @@
dto1.setSjrq(date);
dto1.setCzybm("00029");
dto1.setCzyksbm("0101");
+ dto1.setCflxbm("A");
+ dto1.setYfbm("1");
dto1.setDetails(outpinmedicapplyDetilsDtos);
AjaxResult result = controller.Outpinmedicapply(dto1);
String result1 = getAjaxResult(result);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
index 102d522..718f0f6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -331,7 +331,7 @@
public AjaxResult Outpinmedicapply (OutpinmedicapplyDto dao) {
Map<String, Object> map = new HashMap<> ();
map.put ("his_registration_id", dao.getHisRegistrationId ());
- map.put ("sfzh", dao.getHisRegistrationId ());
+ map.put ("sfzh", dao.getSfzh ());
map.put ("sqysbm", dao.getSqysbm ());
map.put ("mzksbm", dao.getMzksbm ());
map.put ("sjrq", dao.getSjrq ());
@@ -339,8 +339,8 @@
map.put ("czyksbm", dao.getCzyksbm ());
map.put ("cflxbm", dao.getCflxbm ());
map.put ("yfbm", dao.getYfbm ());
- map.put ("fyts", dao.getFyts ());
- map.put ("mzzd", dao.getMzzd ());
+ map.put ("fyts","1");
+ map.put ("mzzd","");
map.put ("details", dao.getDetails ());
String post = HttpClientUtils.sendPost (HIS_URL+"Outpinmedicapply", map);
return AjaxResult.success ().put ("data", post);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 819cfa8..a510ec2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -124,6 +124,8 @@
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
@Autowired
private TjProBlService blService;
+ @Resource
+ private ITjFlowingWaterService tjFlowingWaterService;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
long l = System.currentTimeMillis();
@@ -501,6 +503,9 @@
String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();
+ tjFlowingWater.setJxbz(jxbz);
+ tjFlowingWaterService.updateById(tjFlowingWater);
+
TjProBl proBl=new TjProBl();
proBl.setTjh(order.getTjNumber());
proBl.setBldh(jxbz);
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 7dd7d38..caec8fa 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
@@ -511,9 +511,13 @@
if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
jcbgd.setYxzd(objectMap.get("YXZD").toString());
- if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals(""))
- jcbgd.setYxbx(objectMap.get("YXBX").toString());
-
+ if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")){
+ if(objectMap.get("YXBX").toString().equals("null")){
+ jcbgd.setYxbx("鏈寮傚父");
+ }else {
+ jcbgd.setYxbx(objectMap.get("YXBX").toString());
+ }
+ }
if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 7fbd094..5e5f277 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -4,4 +4,4 @@
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: prod
\ No newline at end of file
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java
index 5139a63..daa33d9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java
@@ -8,17 +8,17 @@
private String ypbm;
private String pcbm;
- private Integer zh;
- private Integer dcjl;
+ private String zh;
+ private String dcjl;
private String jldw;
private String tjbm;
private String ps;
private String psbm;
- private Integer sl;
- private Integer yyts;
- private Integer pj;
- private Integer jj;
- private Integer dj;
+ private String sl;
+ private String yyts;
+ private String pj;
+ private String jj;
+ private String dj;
private String xtph;
private String scph;
private String ypxq;
@@ -26,5 +26,5 @@
private String kfdw;
private String yfdw;
private String yysm;
- private Integer fzbl;
+ private String fzbl;
}
--
Gitblit v1.8.0