From 67d934b740862de1db1951137b5590410f3eb92b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 八月 2025 13:34:39 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 170 ++++++---
smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospReqVO.java | 85 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 2
smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java | 191 +++++++++++
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 34 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSLTDExternalController.java | 373 +++++++++++++++++++++
smartor/src/main/java/com/smartor/domain/ServiceSLTDContactsResDTO.java | 28 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 4
smartor/src/main/java/com/smartor/domain/ServiceSLTDCommonVO.java | 49 ++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 28 +
smartor/src/main/java/com/smartor/domain/ServiceSLTDDiagnosisResDTO.java | 28 +
11 files changed, 915 insertions(+), 77 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 1eb99d4..6e59d31 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -108,6 +108,8 @@
@PostMapping("/selectPatMedInhospListCount")
@ApiOperation("鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟")
public AjaxResult selectPatMedInhospListCount(@RequestBody PatMedReq patMedReq) {
+ SysUser user = getLoginUser().getUser();
+ patMedReq.setOrgid(user.getOrgid());
return success(patMedInhospService.selectPatMedInhospListCount(patMedReq));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
index e41dc06..c0d92e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -68,13 +68,13 @@
@PostMapping("/selectPatMedOuthospCount")
@ApiOperation("鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁�")
public AjaxResult selectPatMedOuthospCount(@RequestBody PatMedReq patMedReq) {
-// SysUser user = getLoginUser().getUser();
+ SysUser user = getLoginUser().getUser();
// List<String> deptCode = new ArrayList<>();
// for (Map<String, Object> map : user.getBelongDepts()) {
// if (ObjectUtils.isNotEmpty(map.get("deptCode"))) deptCode.add(map.get("deptCode").toString());
// }
// patMedReq.setDeptcodeList(deptCode);
-
+ patMedReq.setOrgid(user.getOrgid());
PatMedRes patMedRes = patMedOuthospService.selectPatMedOuthospCount(patMedReq);
return success(patMedRes);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSLTDExternalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSLTDExternalController.java
new file mode 100644
index 0000000..0b3864b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSLTDExternalController.java
@@ -0,0 +1,373 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.smartor.domain.ServiceQueryFocus;
+import com.smartor.domain.ServiceQueryInfo;
+import com.smartor.domain.ServiceTaskInfo;
+import com.smartor.service.IServiceExternalService;
+import com.smartor.service.ISvyTaskSingleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 鐪佺珛鍚屽痉鏁版嵁閲囬泦璋冪敤鎺ュ彛Controller
+ *
+ * @author smartor
+ * @date 2024-12-10
+ */
+@Slf4j
+@Api(description = "鐪佺珛鍚屽痉鏁版嵁閲囬泦璋冪敤鎺ュ彛")
+@RestController
+@RequestMapping("/smartor/serviceSLTDExternal")
+public class ServiceSLTDExternalController extends BaseController {
+ @Autowired
+ private IServiceExternalService serviceExternalService;
+ @Autowired
+ private ISvyTaskSingleService svyTaskSingleService;
+
+ /**
+ * 閫氱敤鎺ュ彛
+ */
+ @ApiOperation("閫氱敤鎺ュ彛")
+ @PostMapping("/generalInterface")
+ public Map<String, Object> generalInterface(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+
+ try {
+ aBoolean = serviceExternalService.generalInterface(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---generalInterface鍑哄紓甯镐簡锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板浣撴浠诲姟杩涘瓙浠诲姟
+ */
+ @ApiOperation("鏂板浣撴浠诲姟杩涘瓙浠诲姟")
+ @PostMapping("/generalInterfaceAddTask")
+ public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceTaskInfo) {
+ log.info("------serviceTaskInfo鐨勫�间负锛歿}", serviceTaskInfo);
+ Integer res = 0;
+ try {
+ res = svyTaskSingleService.insertTaskInfo(serviceTaskInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---generalInterfaceAddTask鍑哄紓甯镐簡锛歿}", e.getMessage());
+ }
+ return toAjax(res);
+ }
+
+
+ /**
+ * 360鎮ｈ�呬俊鎭幏鍙�
+ */
+ @ApiOperation("360鎮ｈ�呬俊鎭幏鍙�")
+ @PostMapping("/query360PatInfo")
+ public Map query360PatInfo(@RequestBody ServiceQueryInfo serviceQueryInfo) {
+ log.info("------serviceQueryInfo鐨勫叆鍙備负锛歿}", serviceQueryInfo);
+ Map map = null;
+ try {
+ map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("query360PatInfo---query360PatInfo锛歿}", e.getMessage());
+ }
+ return map;
+ }
+
+ /**
+ * 鍖诲槺鐭ヨ瘑鎻愮ず
+ */
+ @ApiOperation("鍖诲槺鐭ヨ瘑鎻愮ず")
+ @PostMapping("/focus")
+ public Map focus(@RequestBody ServiceQueryFocus serviceQueryFocus) {
+ Map map = null;
+ try {
+ map = svyTaskSingleService.focus(serviceQueryFocus);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("query360PatInfo---query360PatInfo锛歿}", e.getMessage());
+ }
+ return map;
+ }
+
+
+ /**
+ * 鏂板绉戝淇℃伅
+ */
+ @ApiOperation("鏂板绉戝淇℃伅")
+ @PostMapping("/addDeptInfo")
+ public Map<String, Object> addDeptInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addDeptInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addDeptInfo鍑哄紓甯镐簡锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板绉戝淇℃伅
+ */
+ @ApiOperation("鏂板鐢ㄦ埛淇℃伅")
+ @PostMapping("/addUserInfo")
+ public Map<String, Object> addUserInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addUserInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addUserInfo鍑哄紓甯镐簡锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+
+ }
+
+
+ /**
+ * 鏂板鏈烘瀯淇℃伅
+ */
+ @ApiOperation("鏂板鏈烘瀯淇℃伅")
+ @PostMapping("/addOrganInfo")
+ public Map<String, Object> addOrganInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addOrganInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addOrganInfo鍑哄紓甯镐簡锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板鍏ラ櫌淇℃伅
+ */
+ @ApiOperation("鏂板鍏ラ櫌淇℃伅")
+ @PostMapping("/addInHospInfo")
+ public Map<String, Object> addInHospInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addInHospInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addInHospInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鍙栨秷鍏ラ櫌鐧昏淇℃伅
+ */
+ @ApiOperation("鍙栨秷鍏ラ櫌鐧昏淇℃伅")
+ @PostMapping("/cancelInHospInfo")
+ public Map<String, Object> cancelInHospInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.cancelInHospInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---cancelInHospInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板鍑洪櫌鐧昏淇℃伅
+ */
+ @ApiOperation("鏂板鍑洪櫌鐧昏淇℃伅")
+ @PostMapping("/addOutHospInfo")
+ public Map<String, Object> addOutHospInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addOutHospInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addOutHospInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ *
+ */
+ @ApiOperation("鏂板鍑洪櫌璁板綍鐧昏淇℃伅")
+ @PostMapping("/addOutHospJLInfo")
+ public Map<String, Object> addOutHospJLInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addOutHospJLInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addOutHospJLInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鍙栨秷鍑洪櫌鐧昏淇℃伅
+ */
+ @ApiOperation("鍙栨秷鍑洪櫌鐧昏淇℃伅")
+ @PostMapping("/cancelOutHospInfo")
+ public Map<String, Object> cancelOutHospInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.cancelOutHospInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---cancelOutHospInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板鍑洪櫌鐧昏淇℃伅
+ */
+ @ApiOperation("鏂板棰勫嚭闄㈢櫥璁颁俊鎭�")
+ @PostMapping("/addPreOutHospInfo")
+ public Map<String, Object> addPreOutHospInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addPreOutHospInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addPreOutHospInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板瀹屾垚鎺ヨ瘖淇℃伅
+ */
+ @ApiOperation("鏂板瀹屾垚鎺ヨ瘖淇℃伅")
+ @PostMapping("/addFinshJZInfo")
+ public Map<String, Object> addFinshJZInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addFinshJZInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addFinshJZInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板瀹屾垚鎺ヨ瘖淇℃伅
+ */
+ @ApiOperation("鏂板鐤剧梾淇℃伅")
+ @PostMapping("/addDiseaseInfo")
+ public Map<String, Object> addDiseaseInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addDiseaseInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addDiseaseInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 鏂板鐥呭尯淇℃伅
+ */
+ @ApiOperation("鏂板鐥呭尯淇℃伅")
+ @PostMapping("/addWardAreaInfo")
+ public Map<String, Object> addWardAreaInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addWardAreaInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addWardAreaInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+
+ /**
+ * 妫�鏌ョ敵璇锋湇鍔�/妫�鏌ヤ慨鏀规湇鍔�
+ */
+ @ApiOperation("妫�鏌ョ敵璇锋湇鍔�")
+ @PostMapping("/addInspectService")
+ public Map<String, Object> addInspectService(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addInspectService(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addInspectService锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
+ * 妫�鏌ユ姤鍛婃湇鍔�
+ */
+ @ApiOperation("妫�鏌ユ姤鍛婃湇鍔�")
+ @PostMapping("/addInspectBGService")
+ public Map<String, Object> addInspectBGService(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addInspectBGService(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addInspectBGService锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+
+
+
+ private Map<String, Object> returnParam(Boolean b, Map dataMap) {
+ Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ String XiaoXiID = (String) yeWuXX.get("XiaoXiID");
+
+ Map<String, Object> map = new HashMap<>();
+ if (b) {
+ map.put("Code", "0");
+ map.put("Message", "success");
+ } else {
+ map.put("Code", "500");
+ map.put("Message", "error");
+ }
+
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("XiaoXiID", XiaoXiID);
+ map2.put("ChuangJianSJ", new Date());
+ map.put("Data", map2);
+ return map;
+ }
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSLTDCommonVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSLTDCommonVO.java
new file mode 100644
index 0000000..a2dc35e
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSLTDCommonVO.java
@@ -0,0 +1,49 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "ServiceSLTDCommonVO", description = "鐪佺珛鍚屽痉鍏叡瀛楁")
+@Data
+public class ServiceSLTDCommonVO {
+ @ApiModelProperty(value = "鏈烘瀯ID 鏈烘瀯鍞竴缂栧彿")
+ private String orgId;
+
+ @ApiModelProperty(value = "鏈烘瀯鍚嶇О 鏈烘瀯鍚嶇О")
+ private String orgName;
+
+ @ApiModelProperty(value = "闄㈠尯ID 闄㈠尯鍞竴缂栧彿")
+ private String campusId;
+
+ @ApiModelProperty(value = "闄㈠尯鍚嶇О 闄㈠尯鍚嶇О")
+ private String campusName;
+
+ @ApiModelProperty(value = "鐥呭尯ID 鐥呭尯鍞竴缂栧彿")
+ private String areaId;
+
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О 鐥呭尯鍚嶇О")
+ private String areaName;
+
+ @ApiModelProperty(value = "绉戝ID 绉戝鍞竴缂栧彿")
+ private String deptId;
+
+ @ApiModelProperty(value = "绉戝鍚嶇О 绉戝鍚嶇О")
+ private String deptName;
+
+ @ApiModelProperty(value = "灏辫瘖璁板綍ID 鎮ｈ�呭崟娆″氨璇婂敮涓�璁板綍ID")
+ private String healthcareRecordId;
+
+ @ApiModelProperty(value = "灏辫瘖娴佹按鍙� 鎮ｈ�呭崟娆″氨璇婂敮涓�涓氬姟娴佹按鍙�")
+ private String healthcareRecordNo;
+
+ @ApiModelProperty(value = "鐥呭巻鍙� 鎮ｈ�呴櫌鍐呭崱鍙凤紝鏈烘瀯鍐呭敮涓�")
+ private String medicalRecordNo;
+
+ @ApiModelProperty(value = "灏辫瘖鍗″彿 鎮ｈ�呭綋娆″氨璇婂嚟璇佸彿")
+ private String medicalCardNo;
+
+ @ApiModelProperty(value = "鎮ｈ�呮。妗圛D 鎮ｈ�呴櫌鍐呭敮涓�缂栫爜")
+ private String patientId;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSLTDContactsResDTO.java b/smartor/src/main/java/com/smartor/domain/ServiceSLTDContactsResDTO.java
new file mode 100644
index 0000000..7e0057e
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSLTDContactsResDTO.java
@@ -0,0 +1,28 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "ServiceSLTDContactsResDTO", description = "鐪佺珛鍚屽痉鑱旂郴浜哄搷搴斾俊鎭�")
+@Data
+public class ServiceSLTDContactsResDTO {
+ @ApiModelProperty(value = "鏈烘瀯ID 鏈烘瀯鍞竴缂栧彿")
+ private String orgId;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄鍚�")
+ private String name;
+
+
+ @ApiModelProperty(value = "鑱旂郴浜哄叧绯荤紪鐮�")
+ private String relationshipCode;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄叧绯诲悕绉�")
+ private String relationship;
+
+ @ApiModelProperty(value = "鑱旂郴浜鸿仈绯绘柟寮�")
+ private String telecom;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄湴鍧�")
+ private String currentAddress;
+}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSLTDDiagnosisResDTO.java b/smartor/src/main/java/com/smartor/domain/ServiceSLTDDiagnosisResDTO.java
new file mode 100644
index 0000000..c4be426
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSLTDDiagnosisResDTO.java
@@ -0,0 +1,28 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "ServiceSLTDDiagnosisResDTO", description = "鐪佺珛鍚屽痉璇婃柇鍝嶅簲淇℃伅")
+@Data
+public class ServiceSLTDDiagnosisResDTO {
+
+ @ApiModelProperty(value = "鑱旂郴浜哄鍚�")
+ private String name;
+
+ @ApiModelProperty(value = "璇婃柇icd缂栫爜")
+ private String diagnosisDictCode;
+
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String diagnosisDictName;
+
+ @ApiModelProperty(value = " 璇婃柇绫诲埆 FH0176.01-鍏ラ櫌璇婃柇 FH0176.02-鍒濇璇婃柇x0;\n" + " FH0176.03-淇璇婃柇\n" + " FH0176.04-琛ュ厖璇婃柇\n" + " FH0176.05-鍑洪櫌璇婃柇\n" + " FH0176.06-涓绘不璇婃柇")
+ private String diagnosisCategory;
+
+ @ApiModelProperty(value = "璇婃柇绫诲瀷 1-涓尰璇婃柇 2-瑗垮尰璇婃柇")
+ private Integer recordType;
+
+ @ApiModelProperty(value = "鏄惁涓昏瘖鏂� 1-涓昏瘖鏂� 0-闈炰富璇婃柇")
+ private Integer isMainDiagnosis;
+}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospReqVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospReqVO.java
new file mode 100644
index 0000000..ddfbcb8
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospReqVO.java
@@ -0,0 +1,85 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "ServiceSLTDCommonReqVO", description = "鐪佺珛鍚屽痉鍑哄叆闄㈣姹備俊鎭�")
+@Data
+public class ServiceSLTDInhospReqVO {
+ @ApiModelProperty(value = "鏈烘瀯ID 鏈烘瀯鍞竴缂栧彿")
+ private String orgId;
+
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private Long campusId;
+
+ @ApiModelProperty(value = "鎮ｈ�呭鍚� 蹇呭～涓�涓�")
+ private String patientNamex0;
+
+
+ @ApiModelProperty(value = "韬唤璇佸彿 蹇呭～涓�涓�")
+ private String idCardNox0;
+
+ @ApiModelProperty(value = "鐥呭尯id 蹇呭～涓�涓�")
+ private Long areaId;
+
+ @ApiModelProperty(value = "绉戝ID 蹇呭～涓�涓�")
+ private Long deptId;
+
+ @ApiModelProperty(value = "绉戝ID闆嗗悎")
+ private List<Long> deptIdList;
+
+ @ApiModelProperty(value = "璇婄枟璁板綍鍙� 蹇呭～涓�涓�")
+ private String healthcareRecordNo;
+
+ @ApiModelProperty(value = "璇婄枟璁板綍鍙烽泦鍚�")
+ private List<String> healthcareRecordNoListx0;
+
+ @ApiModelProperty(value = "鐥呭巻鍙� 蹇呭～涓�涓�")
+ private String medicalRecordNo;
+
+ @ApiModelProperty(value = "璇婄枟璁板綍Id 蹇呭～涓�涓�")
+ private Long healthcareRecordId;
+
+ @ApiModelProperty(value = "璇婄枟璁板綍ID闆嗗悎")
+ private List<Long> idList;
+
+ @ApiModelProperty(value = "灏辫瘖鍗″彿 蹇呭～涓�涓�")
+ private String medicalCardNo;
+
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿-寮�濮嬫椂闂�")
+ private String startHeadTime;
+
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿-缁撴潫鏃堕棿 yyyy-MM-dd")
+ private String startTailTimex0;
+
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿-寮�濮嬫椂闂� yyyy-MM-dd")
+ private String preOutHospitalHeadDatex0;
+
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿-缁撴潫鏃堕棿 yyyy-MM-dd")
+ private String preOutHospitalTailDatex0;
+
+ @ApiModelProperty(value = "灏辫瘖鏃堕棿-寮�濮嬫椂闂� : 闂ㄨ瘖璇婄枟璁板綍涓哄彿婧愭椂闂� 浣忛櫌璇婄枟璁板綍涓哄叆闄㈢櫥璁版椂闂� yyyy-MM-dd")
+ private String encounterTimeStart;
+
+ @ApiModelProperty(value = "灏辫瘖鏃堕棿-缁撴潫鏃堕棿 yyyy-MM-dd")
+ private String encounterTimeEnd;
+
+ @ApiModelProperty(value = "鍑洪櫌缁撶畻鏃堕棿-寮�濮嬫椂闂� yyyy-MM-dd")
+ private String outHospitalSettleHeadDate;
+
+ @ApiModelProperty(value = "鍑洪櫌缁撶畻鏃堕棿-缁撴潫鏃堕棿 yyyy-MM-dd")
+ private String outHospitalSettleTailDate;
+
+ @ApiModelProperty(value = "璇婄枟绫诲瀷锛� FH0108.01-闂ㄨ瘖 FH0108.02-浣忛櫌 FH0108.03-鎬ヨ瘖 FH0108.04-鐣欒" + "FH0108.05-鎶㈡晳FH0108.06-闂ㄨ瘖浣撴 FH0108.07-浣忛櫌浣撴")
+ private List<String> healthcareRecordTypeList;
+
+ @ApiModelProperty(value = "璇婄枟鐘舵�� 鍙傝�冨�煎煙鏂囨。2.6")
+ private List<String> statusList;
+
+ @ApiModelProperty(value = "鏄惁鍙栨渶杩戜竴娆¤瘖鐤椾俊鎭� 榛樿涓篺alse")
+ private Boolean recently;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java b/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java
new file mode 100644
index 0000000..9d74536
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java
@@ -0,0 +1,191 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "ServiceSLTDCommonReqDTO", description = "鐪佺珛鍚屽痉鍑哄叆闄㈠搷搴斾俊鎭�")
+@Data
+public class ServiceSLTDInhospResDTO {
+ @ApiModelProperty(value = "鏈烘瀯ID 鏈烘瀯鍞竴缂栧彿")
+ private String orgId;
+
+ @ApiModelProperty(value = "璇婄枟璁板綍id 鎮ｈ�呮瘡娆″氨璇婇兘涓嶇浉鍚�")
+ private Long healthcareRecordId;
+
+ @ApiModelProperty(value = "璇婄枟璁板綍鍙� 鎮ｈ�呮瘡娆″氨璇婇兘涓嶇浉鍚�")
+ private String healthcareRecordNo;
+
+ @ApiModelProperty(value = "鎮ｈ�卛d 鎮ｈ�呮瘡娆″氨璇婇兘鐩稿悓")
+ private Long patientId;
+
+ @ApiModelProperty(value = "鎮ｈ�呭悕绉�")
+ private String patientName;
+
+ @ApiModelProperty(value = "鎷奸煶")
+ private String pinyin;
+
+ @ApiModelProperty(value = "姘戞棌")
+ private String nation;
+
+ @ApiModelProperty(value = "灞呮皯韬唤璇佸彿")
+ private String idCardNo;
+
+ @ApiModelProperty(value = "璇婄枟娆℃暟")
+ private Integer healthcareRecordTimes;
+
+ @ApiModelProperty(value = "浣忛櫌娆℃暟")
+ private Integer hospitalizationNumber;
+
+ @ApiModelProperty(value = "灏辫瘖鍗d")
+ private Long medicalCardId;
+
+ @ApiModelProperty(value = "灏辫瘖鍗＄被鍨�")
+ private String medicalCardType;
+
+ @ApiModelProperty(value = "灏辫瘖鍗＄被鍨嬪悕绉�")
+ private String medicalCardTypeName;
+
+ @ApiModelProperty(value = "灏辫瘖鍗″彿")
+ private String medicalCardNo;
+
+ @ApiModelProperty(value = "鐥呭巻鍙� 鎮ｈ�呮瘡娆″氨璇婇兘鐩稿悓")
+ private String medicalRecordNo;
+
+ @ApiModelProperty(value = "鎬у埆鎻忚堪")
+ private String gender;
+
+ @ApiModelProperty(value = "鎬у埆缂栫爜 鎬у埆缂栫爜瀛楀吀:GB/T2261.1.0-鏈煡鐨勬�у埆\n" + " GB/T2261.1.1-鐢穃n" + " GB/T2261.1.2-濂砛n" + " GB/T2261.1.9-鏈鏄庣殑鎬у埆")
+ private String genderCode;
+
+ @ApiModelProperty(value = "骞撮緞")
+ private String age;
+
+ @ApiModelProperty(value = "鍦板潃")
+ private String address;
+
+ @ApiModelProperty(value = "鐢熸棩")
+ private String birthday;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "鐥呭尯id")
+ private Long areaId;
+
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О")
+ private String areaName;
+
+ @ApiModelProperty(value = "鎴块棿id")
+ private Long roomId;
+
+ @ApiModelProperty(value = "鎴垮彿")
+ private String roomNumber;
+
+ @ApiModelProperty(value = "搴婁綅id")
+ private Long bedId;
+
+ @ApiModelProperty(value = "搴婂彿")
+ private String bedNumber;
+
+ @ApiModelProperty(value = "鎶ょ悊绾у埆")
+ private String nursingLevel;
+
+ @ApiModelProperty(value = "鍏ラ櫌鐧昏鏃堕棿")
+ private String encounterTime;
+
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ private String startTimex0;
+
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private String preOutHospitalDatex0;
+
+ @ApiModelProperty(value = "缁撶畻鏃堕棿")
+ private String outHospitalSettleDatex0;
+
+ @ApiModelProperty(value = "璇婃柇缂栫爜: 鏈灏辫瘖鎮ｈ�呮墍鏈夎瘖鏂搴旂殑icd缂栫爜锛岄�氳繃鈥溿�佲�濆垎闅�")
+ private String diagnosisCode;
+
+ @ApiModelProperty(value = "璇婃柇鍚嶇О 鏈灏辫瘖鎮ｈ�呮墍鏈夎瘖鏂悕绉帮紝閫氳繃鈥溿�佲�濆垎闅�")
+ private String diagnosisName;
+
+ @ApiModelProperty(value = "璇婄枟鐘舵�� 鍙傝�冨�煎煙鏂囨。2.6")
+ private String healthcareRecordStatus;
+
+ @ApiModelProperty(value = "璇婄枟绫诲瀷: FH0108.01-闂ㄨ瘖\n" + " FH0108.02-浣忛櫌\n" + " FH0108.03-鎬ヨ瘖\n" + " FH0108.04-鐣欒\n" + " FH0108.05-鎶㈡晳FH0108.06-闂ㄨ瘖浣撴\n" + " FH0108.07-浣忛櫌浣撴")
+ private String healthcareType;
+
+ @ApiModelProperty(value = "绉戝id")
+ private Long deptId;
+
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptName;
+
+ @ApiModelProperty(value = "鍖荤敓id")
+ private Long doctorId;
+
+ @ApiModelProperty(value = "鍖荤敓濮撳悕")
+ private String doctorName;
+
+ @ApiModelProperty(value = "璇婄枟鍛ㄦ湡ID")
+ private Long healthcarePeriodId;
+
+ @ApiModelProperty(value = "鏈�鏂颁竴娆″叆闄㈡椂闂� 涓庡垱寤烘椂闂翠竴鑷磝0")
+ private String lastEncounterTimex0;
+
+ @ApiModelProperty(value = "涓荤鎶ゅ＋ID")
+ private Long chiefNurseId;
+
+ @ApiModelProperty(value = "涓荤鎶ゅ＋鍚嶇О")
+ private String chiefNurseName;
+
+ @ApiModelProperty(value = "璐圭敤绫诲埆")
+ private String costCategoryName;
+
+ @ApiModelProperty(value = "璐圭敤绫诲埆code")
+ private String costCategoryCode;
+
+ @ApiModelProperty(value = "璐圭敤鎬ц川")
+ private String costNatureName;
+
+ @ApiModelProperty(value = "璐圭敤鎬ц川code")
+ private String costNatureCode;
+
+ @ApiModelProperty(value = "鏂囧寲绋嬪害缂栫爜")
+ private String educationCode;
+
+ @ApiModelProperty(value = "鏂囧寲绋嬪害鎻忚堪")
+ private String education;
+
+ @ApiModelProperty(value = "鏄惁鏂扮敓鍎�")
+ private Boolean neonatal;
+
+ @ApiModelProperty(value = "濠氬Щ鐘跺喌缂栫爜")
+ private String marriageCode;
+
+ @ApiModelProperty(value = "濠氬Щ鐘跺喌鎻忚堪")
+ private String marriage;
+
+ @ApiModelProperty(value = "鑱屼笟鎻忚堪")
+ private String occupationType;
+
+ @ApiModelProperty(value = "鑱屼笟缂栫爜")
+ private String occupationTypeCode;
+
+ @ApiModelProperty(value = "澶嶈瘖鐘舵�� 0-鍚�,1-鏄�")
+ private Integer furtherConsultationStatus;
+
+ @ApiModelProperty(value = "绫嶈疮")
+ private String nativePlace;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄垪琛�")
+ private List<ServiceSLTDContactsResDTO> residentContactInfos;
+
+ @ApiModelProperty(value = "璇婃柇鍒楄〃")
+ private List<ServiceSLTDDiagnosisResDTO> diagnosisList;
+
+ @ApiModelProperty(value = "璇婃柇鍒楄〃")
+ private List<ServiceSLTDMedicalRecordResDTO> medicalRecordDataList;
+}
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index d70cb54..4441177 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -76,68 +76,68 @@
<sql id="selectPatMedInhospVo">
select inhospid,
- patname,
- fuflag,
- management_doctor,
- management_doctor_code,
- fudate,
- fuperiod,
- futypecode,
- futypedesc,
- fuadvice,
- fuspecialadvice,
- remark,
- guid,
- operator,
- operator_id,
- out_way_id,
- out_way_name,
- nurse_id,
- nurse_name,
- deptcheck_flag,
- wardcheck_flag,
- diagcheck_flag,
- inhospstate,
- patno,
- long_task_reason,
- inhospno,
- serialnum,
- hospitalname,
- hospitalcode,
- hospitaldistrictcode,
- hospitaldistrictname,
- icd10code,
- diagname,
- starttime,
- endtime,
- deptcode,
- deptname,
- roomno,
- bed_no,
- orgid,
- del_flag,
- update_by,
- update_time,
- create_by,
- create_time,
- isupload,
- upload_time,
- patid,
- leavediagname,
- leaveicd10code,
- drcode,
- drname,
- schemestatus,
- generalschemestatus,
- leaveldeptcode,
- leaveldeptname,
- hospitaldistrictid,
- leavehospitaldistrictcode,
- leavehospitaldistrictname,
- leavehospitaldistrictid,
- deptid,
- leaveldeptid,
- schemetime
+ patname,
+ fuflag,
+ management_doctor,
+ management_doctor_code,
+ fudate,
+ fuperiod,
+ futypecode,
+ futypedesc,
+ fuadvice,
+ fuspecialadvice,
+ remark,
+ guid,
+ operator,
+ operator_id,
+ out_way_id,
+ out_way_name,
+ nurse_id,
+ nurse_name,
+ deptcheck_flag,
+ wardcheck_flag,
+ diagcheck_flag,
+ inhospstate,
+ patno,
+ long_task_reason,
+ inhospno,
+ serialnum,
+ hospitalname,
+ hospitalcode,
+ hospitaldistrictcode,
+ hospitaldistrictname,
+ icd10code,
+ diagname,
+ starttime,
+ endtime,
+ deptcode,
+ deptname,
+ roomno,
+ bed_no,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ patid,
+ leavediagname,
+ leaveicd10code,
+ drcode,
+ drname,
+ schemestatus,
+ generalschemestatus,
+ leaveldeptcode,
+ leaveldeptname,
+ hospitaldistrictid,
+ leavehospitaldistrictcode,
+ leavehospitaldistrictname,
+ leavehospitaldistrictid,
+ deptid,
+ leaveldeptid,
+ schemetime
from pat_med_inhosp
</sql>
@@ -419,7 +419,7 @@
SELECT GROUP_CONCAT(d.tagname, ', ')
FROM pat_archivetag d
WHERE d.patid = #{patid}
- AND d.del_flag = 0
+ AND d.del_flag = 0
</select>
@@ -576,7 +576,8 @@
deptcheck_flag, wardcheck_flag, diagcheck_flag, long_task_reason,
nurse_id, nurse_name, out_way_id, out_way_name, guid,
operator, operator_id, inhospno, remark,
- fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice, management_doctor, management_doctor_doctor
+ fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice, management_doctor,
+ management_doctor_doctor
)
values
<foreach collection="list" item="item" separator=",">
@@ -764,22 +765,60 @@
</select>
<select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
resultType="com.smartor.domain.PatMedRes">
+ SELECT SUM( rs ) AS rs,
+ SUM( rc ) AS rc
+ FROM (
SELECT
COUNT(1) AS rc,
- COUNT(DISTINCT patid) AS rs
+ 0 AS rs
FROM
pat_med_inhosp
<where>
del_flag=0
+ <if test="orgid != null">
+ AND orgid = #{orgid}
+ </if>
<if test="zy != null">
and inhospstate=0
and date_format(starttime,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
and date_format(starttime,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
+ and deptcode in
+ <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
+ #{deptcode}
+ </foreach>
+ </if>
</if>
<if test="cy != null">
and inhospstate=1
and date_format(endtime,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
and date_format(endtime,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
+ and leaveldeptcode in
+ <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ </if>
+
+ </where>
+ union all
+ select
+ 0 AS rc,
+ count(1) AS rs
+ FROM
+ service_subtask
+ <where>
+ del_flag = 0
+ and service_type=2
+ <if test="orgid != null">
+ AND orgid = #{orgid}
+ </if>
+ <if test="startDate != null">
+ AND date_format( visit_time, '%y%m%d' ) >= date_format( #{startDate}, '%y%m%d' )
+ </if>
+ <if test="endDate != null">
+ AND date_format( visit_time, '%y%m%d' ) <= date_format(#{endDate},'%y%m%d')
</if>
<if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
@@ -788,5 +827,6 @@
</foreach>
</if>
</where>
+ ) AS combined_data
</select>
</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 7bfeba3..30ba326 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -351,13 +351,19 @@
<select id="selectPatMedOuthospCount" parameterType="com.smartor.domain.PatMedReq"
resultType="com.smartor.domain.PatMedRes">
+ SELECT SUM( rs ) AS rs,
+ SUM( rc ) AS rc
+ FROM (
SELECT
COUNT(id) AS rc,
- COUNT(DISTINCT patid) AS rs
+ 0 AS rs
FROM
pat_med_outhosp
<where>
del_flag=0
+ <if test="orgid != null">
+ and orgid = #{orgid}
+ </if>
and date_format(admitdate,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
and date_format(admitdate,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
<if test="deptcodeList != null and deptcodeList.size()>0">
@@ -367,6 +373,32 @@
</foreach>
</if>
</where>
+ union all
+ select
+ 0 AS rc,
+ count(1) AS rs
+ FROM
+ service_subtask
+ <where>
+ del_flag = 0
+ and service_type=3
+ <if test="orgid != null">
+ and orgid = #{orgid}
+ </if>
+ <if test="startDate != null">
+ AND date_format( visit_time, '%y%m%d' ) >= date_format( #{startDate}, '%y%m%d' )
+ </if>
+ <if test="endDate != null">
+ AND date_format( visit_time, '%y%m%d' ) <= date_format(#{endDate},'%y%m%d')
+ </if>
+ <if test="deptcodeList != null and deptcodeList.size()>0">
+ and deptcode in
+ <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ </where>
+ ) AS combined_data
</select>
<select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c02bd2d..e1d9330 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1227,8 +1227,12 @@
0 AS pmiCount,
0 AS pmoCount
FROM service_subtask
- WHERE visit_time BETWEEN #{startDate} AND #{endDate}
- AND del_flag = '0'
+ WHERE
+ del_flag = '0'
+ <if test="startDate != null and endDate != null">
+ and date_format(visit_time,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
+ and date_format(visit_time,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
+ </if>
<if test="orgid != null">
AND orgid = #{orgid}
@@ -1297,12 +1301,16 @@
</choose>
0 AS dischargeFollowCount,
0 AS outpatientFollowCount,
- COUNT(DISTINCT patid) AS pmiCount,
+ COUNT( patid) AS pmiCount,
0 AS pmoCount
FROM pat_med_inhosp
- WHERE endtime BETWEEN #{startDate} AND #{endDate}
- AND del_flag = '0'
+ WHERE del_flag = '0'
+ <if test="startDate != null and endDate != null">
+ and date_format(endtime,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
+ and date_format(endtime,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
+ </if>
+ AND inhospstate=1
<if test="orgid != null">
AND orgid = #{orgid}
</if>
@@ -1364,11 +1372,13 @@
0 AS dischargeFollowCount,
0 AS outpatientFollowCount,
0 AS pmiCount,
- COUNT(DISTINCT patid) AS pmoCount
+ COUNT( patid) AS pmoCount
FROM pat_med_outhosp
- WHERE admitdate BETWEEN #{startDate} AND #{endDate}
- AND del_flag = '0'
-
+ WHERE del_flag = '0'
+ <if test="startDate != null and endDate != null">
+ and date_format(admitdate,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
+ and date_format(admitdate,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
+ </if>
<if test="orgid != null">
AND orgid = #{orgid}
</if>
--
Gitblit v1.9.3