From 66a1d779057d1c9fc75abd30218546a419b7b442 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 05 六月 2024 14:31:44 +0800
Subject: [PATCH] zjh 本地 2024/06/05 --1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpintestapplyDto.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 18 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 5 +
ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java | 21 +--
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisMzJysqController.java | 99 +++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 21 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 78 ++++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java | 11 +
ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinregapplyDto.java | 2
9 files changed, 188 insertions(+), 69 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index e11d986..3818777 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -30,16 +30,16 @@
* @param code 鎺ュ彛浠ｇ爜
* @return 鎵ц鏄惁鎴愬姛
*/
- public AjaxResult save(String json, String code) {
+ public AjaxResult save(JSONObject object, String code) {
code = code.toLowerCase();
- JSONObject jsonObject = JSONUtil.parseObj(json);
- JSONObject response = jsonObject.getJSONObject("Response");
+// JSONObject jsonObject = JSONUtil.parseObj(json);
+// JSONObject response = jsonObject.getJSONObject("Response");
String tabName = "ltkj_" + code;
- if (response.getStr("ResultCode").equals("0")) {
- JSONArray resultData = response.getJSONArray("ResultData");
+// if (response.getStr("ResultCode").equals("0")) {
+// JSONObject object = response.getJSONObject("ResultData");
Connection connection = getConnection();
- for (Object resultDatum : resultData) {
- JSONObject object = (JSONObject) resultDatum;
+// for (Object resultDatum : resultData) {
+// JSONObject object = (JSONObject) resultDatum;
Boolean isExists = tabIsExists(connection, tabName);
if (null == isExists)
return AjaxResult.error();
@@ -58,13 +58,13 @@
throwables.printStackTrace();
return AjaxResult.error();
}
- }
+// }
try {
if (connection != null)
connection.close();
} catch (SQLException throwables) {
}
- }
+// }
return AjaxResult.success();
}
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 a869192..b3f55ee 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
@@ -2,6 +2,8 @@
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -48,7 +50,8 @@
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
- return JSONUtil.parseObj(builder);
+ String Response = JSONUtil.parseObj(builder).getStr("Response");
+ return JSONUtil.parseObj(Response);
}
//鑾峰彇鏂规硶杩斿洖鍊间俊鎭�
@@ -61,61 +64,63 @@
public void HisApiMethods(TjCustomer customer, Long orderId) {
HisApiGetMethodService hisApiGetMethodService=new HisApiGetMethodService();
- Date date = new Date();
+ Date dates = new Date();
+ final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
AjaxResult result = controller.Outpincreateapply(customer);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
if (code.equals("0")) {
- Map<String, Object> resultData = (Map<String, Object>) object.get("ResultData");
+ JSONArray resultDatass = object.getJSONArray("ResultData");
+ Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
if (null != resultData && resultData.size() > 0) {
- String cardId = resultData.get("pationid").toString();
- if (null != cardId) {
- customer.setCardId(cardId);
+ String pationid = resultData.get("PationId").toString();
+ if (null != pationid) {
+ customer.setPationId(pationid);
customerService.updateById(customer);
OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
- outpinregapplyDto.setPationid(cardId);
- outpinregapplyDto.setHisRegistrationId(cardId);
+ outpinregapplyDto.setPationid(pationid);
+// outpinregapplyDto.setHisRegistrationId(pationid);
outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
- outpinregapplyDto.setMzksbm("");
- outpinregapplyDto.setCzybm(SecurityUtils.getUsername());
- outpinregapplyDto.setSfjz("鏄�");
- outpinregapplyDto.setGhzlbm("");
- outpinregapplyDto.setYwckbm("");
+ outpinregapplyDto.setMzksbm("0101");
+ outpinregapplyDto.setCzybm("00029");
+ outpinregapplyDto.setSfjz("0");
+ outpinregapplyDto.setGhzlbm("01");
+ outpinregapplyDto.setYwckbm("0001");
outpinregapplyDto.setSflstd("0");
outpinregapplyDto.setGhrq(date);
+ //闂ㄨ瘖鎸傚彿
AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
String result2 = getAjaxResult(ajaxResult);
JSONObject object1 = getJSONObject(result2);
String code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
- List<Map<String, Object>> resultDatas = (List<Map<String, Object>>) object.get("ResultData");
+ JSONArray resultDatas = object1.getJSONArray("ResultData");
if (null != resultDatas && resultDatas.size() > 0) {
- String hisRegistrationId = resultDatas.get(0).get("his_registration_id").toString();
+ Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
+ String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
if (null != hisRegistrationId) {
-
- //闂ㄨ瘖妫�楠岀敵璇�
+ //闂ㄨ瘖鍖荤敓鎺ヨ瘖
AjaxResult result3 = controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
String result4 = getAjaxResult(result3);
JSONObject object2 = getJSONObject(result4);
String code2 = object2.getStr("ResultCode");
if (code2.equals("0")) {
- Map<String, Object> data = (Map<String, Object>) object.get("ResultData");
+ Map<String, Object> data = object2.getJSONObject("ResultData");
String toString = data.get("his_registration_id").toString();
if (null != toString) {
+ //妫�楠岀敵璇�
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(hisRegistrationId);
dto.setSfjz(customer.getCusIdcard());
dto.setSqysbm(SecurityUtils.getUsername());
- dto.setMzksbm("");
+ dto.setMzksbm("0101");
dto.setSjrq(date);
- dto.setCzybm(SecurityUtils.getUsername());
- dto.setCzyksbm("");
+ dto.setCzybm("00029");
+ dto.setCzyksbm("0101");
dto.setSfjz("1");
List<TjOrderDetail> detailList = detailService.getTjOrderDetailListByOrderId(orderId.toString());
-
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
-
if (null != detailList && detailList.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()));
@@ -123,7 +128,12 @@
if (null != projects && projects.size() > 0) {
for (TjProject project : projects) {
OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
- detailsDto.setMxfyxmbm(project.getHisXmbm());
+// if(null !=project.getHisXmbm()){
+// detailsDto.setMxfyxmbm(project.getHisXmbm());
+// }else {
+// detailsDto.setMxfyxmbm(null);
+// }
+ detailsDto.setMxfyxmbm("tj001");
detailsDto.setSfzhfy("1");
detailsDto.setSl(1);
detailsDtos.add(detailsDto);
@@ -136,18 +146,18 @@
JSONObject object3 = getJSONObject(result5);
String code3 = object3.getStr("ResultCode");
if (code3.equals("0")) {
- Map<String, Object> datas = (Map<String, Object>) object.get("ResultData");
- datas.put("cardId",cardId);
+ Map<String, Object> datas = object3.getJSONObject("ResultData");
+ datas.put("cardId",hisRegistrationId);
JSONObject object4 = JSONUtil.parseObj(datas);
- hisApiGetMethodService.save(object4.toString(),"Outpintestapply");
+ hisApiGetMethodService.save(object4,"Outpintestapply");
//闂ㄨ瘖妫�鏌ョ敵璇�
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(hisRegistrationId);
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
outpinexamapplyDto.setSqysbm(SecurityUtils.getUsername());
- outpinexamapplyDto.setMzksbm("");
- outpinexamapplyDto.setCzybm(SecurityUtils.getUsername());
- outpinexamapplyDto.setCzyksbm(SecurityUtils.getUsername());
+ outpinexamapplyDto.setMzksbm("0101");
+ outpinexamapplyDto.setCzybm("00029");
+ outpinexamapplyDto.setCzyksbm("0101");
List<TjOrderDetail> detailLists = detailService.getTjOrderDetailListByOrderId(orderId.toString());
List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
if (null != detailList && detailList.size() > 0) {
@@ -157,7 +167,7 @@
if (null != projects && projects.size() > 0) {
for (TjProject project : projects) {
OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
- detailsDto.setMxfyxmbm(project.getHisXmbm());
+ detailsDto.setMxfyxmbm("tj001");
detailsDto.setSfzhfy("1");
detailsDto.setSl(1);
detailsDtoss.add(detailsDto);
@@ -170,10 +180,10 @@
JSONObject object5 = getJSONObject(result6);
String code4 = object5.getStr("ResultCode");
if(code4.equals("0")){
- Map<String, Object> map = (Map<String, Object>) object.get("ResultData");
- datas.put("cardId",cardId);
+ Map<String, Object> map = object5.getJSONObject("ResultData");
+ map.put("cardId",hisRegistrationId);
JSONObject jsonObject = JSONUtil.parseObj(map);
- hisApiGetMethodService.save(jsonObject.toString(),"Outpinexamapply");
+ hisApiGetMethodService.save(jsonObject,"Outpinexamapply");
}
}
}
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 e1796e6..05fb941 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
@@ -1,6 +1,7 @@
package com.ltkj.web.controller.his;
+import cn.hutool.core.date.DateUtil;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.hisDto.*;
@@ -51,14 +52,14 @@
// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
public AjaxResult Outpincreateapply (TjCustomer customer) {
Map<String, Object> map = new HashMap<> ();
- if (null != customer.getCusId ()) {
- map.put ("pationid", customer.getCusId ());
+ if (null != customer.getPationId () && !customer.getPationId().equals("0")) {
+ map.put ("pationid", customer.getPationId ());
} else {
map.put ("pationid", null);
}
map.put ("brxm", customer.getCusName ());
map.put ("brxb", customer.getCusSex ());
- map.put ("csrq", customer.getCusBrithday ());
+ map.put ("csrq", DateUtil.format(customer.getCusBrithday(),"yyyy-MM-dd"));
map.put ("brnl", customer.getAge ());
map.put ("brnldw", customer.getAgeUnit ());
map.put ("addr", customer.getAddr ());
@@ -70,12 +71,14 @@
map.put ("sfzh", customer.getCusIdcard ());
map.put ("jhrxm", null);
map.put ("jhrsfzh", null);
- map.put ("mz", customer.getCusNational ());
- map.put ("zy", customer.getCareer ());
+ map.put ("mz", null);
+ map.put ("zy","鑱屽憳");
map.put ("fbbm", null);
- map.put ("czy", customer.getCreateBy ());
- map.put ("jkkkh", customer.getIndexCard ());
- map.put ("mindex_id", customer.getIndexCard ());
+ map.put ("czy", "00029");
+ map.put ("jkkkh",null);
+ map.put ("mindex_id",null);
+// map.put ("zybm","鑱屽憳");
+ //鑱屼笟缂栫爜
String post = HttpClientUtils.sendPost (HIS_URL+"Outpincreateapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -86,7 +89,7 @@
//jzrq = "鎺ヨ瘖鏃ユ湡"
//jzysbm = "鎺ヨ瘖鍖诲笀"
public AjaxResult Outpinconapply (String jzh,
- Date jzrq,
+ String jzrq,
String jzysbm) {
Map<String, Object> map = new HashMap<> ();
map.put ("his_registration_id", jzh);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisMzJysqController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisMzJysqController.java
new file mode 100644
index 0000000..f357860
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisMzJysqController.java
@@ -0,0 +1,99 @@
+package com.ltkj.web.controller.his;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-04 16:00
+ 闂ㄨ瘖妫�楠岀敵璇�
+ * */
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.hosp.domain.TjOrderDetail;
+import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto;
+import com.ltkj.hosp.hisDto.OutpintestapplyDto;
+import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.service.ITjOrderDetailService;
+import com.ltkj.hosp.service.ITjOrderService;
+import com.ltkj.hosp.service.ITjProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Component
+public class HisMzJysqController {
+ @Autowired
+ private HisApiMethodService controller;
+ @Resource
+ private ITjOrderService orderService;
+ @Autowired
+ private ITjCustomerService customerService;
+ @Resource
+ private ITjOrderDetailService detailService;
+ @Resource
+ private ITjProjectService projectService;
+
+
+ //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚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();
+ }
+
+
+ public void getHisMzJysq(String sfzh, String cardId, String orderId) {
+
+ Date dates = new Date();
+ final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+
+ //闂ㄨ瘖妫�楠岀敵璇�
+ OutpintestapplyDto dto = new OutpintestapplyDto();
+ dto.setHisRegistrationId(cardId);
+ dto.setSfjz(sfzh);
+ dto.setSqysbm(SecurityUtils.getUsername());
+ dto.setMzksbm("0101");
+ dto.setSjrq(date);
+ dto.setCzybm("00029");
+ dto.setCzyksbm("0101");
+ dto.setSfjz("1");
+ List<TjOrderDetail> detailList = detailService.getTjOrderDetailListByOrderId(orderId);
+
+ List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
+
+ if (null != detailList && detailList.size() > 0) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.in(TjProject::getProId, detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()));
+ List<TjProject> projects = projectService.list(wq);
+ if (null != projects && projects.size() > 0) {
+ for (TjProject project : projects) {
+ OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+ detailsDto.setMxfyxmbm(project.getHisXmbm());
+ detailsDto.setSfzhfy("1");
+ detailsDto.setSl(1);
+ detailsDtos.add(detailsDto);
+ }
+ }
+ }
+ dto.setDetails(detailsDtos);
+ AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
+ String result5 = getAjaxResult(ajaxResult1);
+ JSONObject object3 = getJSONObject(result5);
+ String code3 = object3.getStr("ResultCode");
+ System.out.println(code3);
+ }
+ }
+
+
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 273196a..b2db192 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
@@ -60,6 +60,7 @@
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiMethod;
+import com.ltkj.web.controller.his.HisMzJysqController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -173,6 +174,9 @@
@Autowired
private HisApiMethod hisApiMethod;
+
+ @Autowired
+ private HisMzJysqController hisMzJysqController;
/**
@@ -1022,6 +1026,7 @@
tjCustomerService.updateById(tjCustomer);
//璋冪敤his鎺ュ彛
hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
+// hisMzJysqController.getHisMzJysq(tjCustomer.getCusIdcard(),tjCustomer.getCardId(),tjOrder.getOrderId().toString());
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java b/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
index 6412b31..f46fdcd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
@@ -1,6 +1,8 @@
package com.ltkj.web.wxUtils;
+import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
@@ -35,6 +37,7 @@
* @create 2019-02-10 涓嬪崍 2:49
*/
@Component
+@Slf4j
public class HttpClientUtils {
/**
@@ -99,27 +102,19 @@
URL url = new URL(httpUrl);
// 2. 鍒涘缓 HttpURLConnection 瀵硅薄
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-
// 3. 璁剧疆璇锋眰鏂规硶涓� POST
connection.setRequestMethod("POST");
-
// 4. 璁剧疆 Content-Type 澶撮儴瀛楁
connection.setRequestProperty("Content-Type", "application/json");
-
- // 5. 璁剧疆鍏朵粬璇锋眰澶撮儴瀛楁锛堝彲閫夛級
-// connection.setRequestProperty("Authorization", "Bearer token");
-// connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-
// 6. 鍚戞湇鍔″櫒鍙戦�佹暟鎹�
- String requestBody = maps.toString();
+ String requestBody = JSONUtil.toJsonStr(maps);
+ log.info(httpUrl+"鍏ュ弬: "+requestBody);
+// String requestBody1 = maps.toString();
byte[] postData = requestBody.getBytes("UTF-8");
connection.setDoOutput(true);
try (OutputStream outputStream = connection.getOutputStream()) {
outputStream.write(postData);
}
-
- // 7. 鑾峰彇鍝嶅簲鐮�
- int responseCode = connection.getResponseCode();
// 8. 鑾峰彇鍝嶅簲鏁版嵁
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
@@ -128,7 +123,9 @@
while ((line = reader.readLine()) != null) {
response.append(line);
}
- System.out.println(response.toString());
+ log.info("=====================================================");
+ log.info(httpUrl+"鍑哄弬");
+ log.info(response.toString());
connection.disconnect();
return response.toString();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
index 7a5c387..d05b873 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
@@ -48,6 +48,14 @@
@ExcelImport(value = "濮撳悕", required = true)
private String cusName;
+
+ @ApiModelProperty("灏辫瘖缂栧彿")
+ private String cardId;
+
+
+ @ApiModelProperty("鎮ｈ�卙is ID锛屾偅鑰呭敮涓�鍙�")
+ private String pationId;
+
/**
* 瀹㈡埛鎬у埆
*/
@@ -306,9 +314,6 @@
@ApiModelProperty("搴ф満")
private String dwPhone;
-
- @ApiModelProperty("灏辫瘖缂栧彿")
- private String cardId;
@ApiModelProperty("鏂囧寲绋嬪害")
private String wenHua;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinregapplyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinregapplyDto.java
index 47f95a2..431573e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinregapplyDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinregapplyDto.java
@@ -19,5 +19,5 @@
private String ywckbm;
private String sflstd;
@JsonFormat(pattern = "yyyy-mm-dd")
- private Date ghrq;
+ private String ghrq;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpintestapplyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpintestapplyDto.java
index 77f6143..7a35a0b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpintestapplyDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpintestapplyDto.java
@@ -15,7 +15,7 @@
private String sqysbm;
private String mzksbm;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date sjrq;
+ private String sjrq;
private String czybm;
private String czyksbm;
private String sfjz;
--
Gitblit v1.8.0