From 86eb021bc2619d3b1eebfb82edd8181fc894a6de Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 11 七月 2024 11:54:24 +0800
Subject: [PATCH] Merge branch 'rx0711-回访优化' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java | 4 ++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java | 21 +++++++++++++++++++++
3 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java
new file mode 100644
index 0000000..43ca179
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java
@@ -0,0 +1,21 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "systemParameter")
+public interface SSystemParameterService {
+
+ /**
+ * 鑾峰彇閰嶇疆
+ * @param paramName 閰嶇疆鍚嶇О
+ * @return
+ */
+ @PostMapping(value = "/system/parameter/get")
+ Result getSystemParameterByNAME(@RequestParam("paramName") String paramName);
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
index 6d22feb..78298d0 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
@@ -59,6 +59,10 @@
private Integer visitResultStatus;
/**鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�*/
private Integer satisfiedStatus;
+ /**鍒涘缓浜虹被鍨� 0 绗笁鏂瑰钩鍙�(鍛樺伐淇℃伅) 1 鍚庡彴 (鍚庡彴鐢ㄦ埛淇℃伅)锛�2 绯荤粺鍒涘缓**/
+ private Integer createPersonType;
+
+
//--- 鍙栧�肩涓�涓� todo
@@ -116,6 +120,10 @@
this.satisfiedStatus = MapUtil.getInt(recordMap,"satisfiedStatus");
this.situation = MapUtil.getString(recordMap,"situation");
this.visitRemark = MapUtil.getString(recordMap,"visitRemark");
+ this.createPersonType = MapUtil.getInt(recordMap,"createPersonType");
+ if(MapUtil.getInt(recordMap,"createPersonType")!=2){
+ this.id = MapUtil.getString(recordMap,"id");
+ }
}
}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
index dd0489a..a62852d 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
@@ -25,6 +25,10 @@
private String returnVisitMethod;
/*** 鍥炶缁撴灉**/
private Integer visitResultStatus;
+ /*** 蹇�熷洖璁挎椂浼犲�硷紙宸插洖璁匡級鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁� **/
+ private Integer returnVisitStatus;
+ /*** 鏄惁婊℃剰**/
+ private Integer satisfiedStatus;
/*** 闂ㄥ簵**/
private String shopId;
/*** 鍛樺伐id **/
--
Gitblit v1.8.0