jiangjiazhi / regional-platform

Commit 7bb5cc7efa81c76cc9fdd7910613fa5396195473

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

update

Showing 7 changed files with 100 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java

...	...	@@ -1966,6 +1966,7 @@
1966	1966	if (patientsQueryRequest.getQueryType() != null) {
1967	1967	// 0 高危孕妇 1 全部孕妇 2全部产妇 3产后孕妇统计导出
1968	1968	if (patientsQueryRequest.getQueryType() == 0) {
	1969	+ String hospital = autoMatchFacade.getHospitalId(userId);
1969	1970	listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null, Boolean.FALSE);
1970	1971	List list = listResponse.getData();
1971	1972	for (Object obj : list) {
...	...	@@ -1973,6 +1974,10 @@
1973	1974	RiskPatientsResult rp = (RiskPatientsResult) obj;
1974	1975	data.put("name", rp.getName());
1975	1976	data.put("age", rp.getAge());
	1977	+ if ("1000000115".equals(hospital)) {
	1978	+ data.put("cardNo", rp.getCardNo());
	1979	+ data.put("vcCardNo", rp.getVcCardNo());
	1980	+ }
1976	1981	data.put("dueWeek", rp.getDueWeek());
1977	1982	data.put("rLevel", getLevel(rp.getrLevel()));
1978	1983	data.put("rFactor", rp.getrFactor());
...	...	@@ -1990,6 +1995,10 @@
1990	1995	}
1991	1996	cnames.put("name", "姓名");
1992	1997	cnames.put("age", "当前年龄");
	1998	+ if ("1000000115".equals(hospital)) {
	1999	+ cnames.put("cardNo", "身份证");
	2000	+ cnames.put("vcCardNo", "就诊卡号");
	2001	+ }
1993	2002	cnames.put("dueWeek", "当前孕周");
1994	2003	cnames.put("rLevel", "高危等级");
1995	2004	cnames.put("rFactor", "高危风险因素");
...	...	@@ -2004,6 +2013,7 @@
2004	2013	cnames.put("serviceType", "服务类型");
2005	2014	cnames.put("serviceStatus", "服务状态");
2006	2015	} else if (patientsQueryRequest.getQueryType() == 1) {
	2016	+ String hospital = autoMatchFacade.getHospitalId(userId);
2007	2017	listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE);
2008	2018	List list = listResponse.getData();
2009	2019	for (Object obj : list) {
...	...	@@ -2011,6 +2021,10 @@
2011	2021	QuanPatientsResult rp = (QuanPatientsResult) obj;
2012	2022	data.put("name", rp.getName());
2013	2023	data.put("age", rp.getAge());
	2024	+ if ("1000000115".equals(hospital)) {
	2025	+ data.put("cardNo", rp.getCardNo());
	2026	+ data.put("vcCardNo", rp.getVcCardNo());
	2027	+ }
2014	2028	data.put("dueWeek", rp.getDueWeek());
2015	2029	data.put("rLevel", getLevel(rp.getrLevel()));
2016	2030	data.put("cTimes", rp.getcTimes());
...	...	@@ -2026,6 +2040,10 @@
2026	2040	}
2027	2041	cnames.put("name", "姓名");
2028	2042	cnames.put("age", "当前年龄");
	2043	+ if ("1000000115".equals(hospital)) {
	2044	+ cnames.put("cardNo", "身份证");
	2045	+ cnames.put("vcCardNo", "就诊卡号");
	2046	+ }
2029	2047	cnames.put("dueWeek", "当前孕周");
2030	2048	cnames.put("rLevel", "高危等级");
2031	2049	cnames.put("cTimes", "总产检次数");
...	...	@@ -2052,6 +2070,10 @@
2052	2070	data.put("createdWeek", rp.getCreatedWeek());
2053	2071	data.put("yyzyfmHospitalId", rp.getYyzyfmHospitalId());
2054	2072	}
	2073	+ if ("1000000115".equals(hospital)) {
	2074	+ data.put("cardNo", rp.getCardNo());
	2075	+ data.put("vcCardNo", rp.getVcCardNo());
	2076	+ }
2055	2077	data.put("cTime", rp.getcTime());
2056	2078	data.put("rLevel", getLevel(rp.getrLevel()));
2057	2079	data.put("rFactor", rp.getrFactor());
...	...	@@ -2068,6 +2090,10 @@
2068	2090	}
2069	2091	cnames.put("name", "姓名");
2070	2092	cnames.put("age", "分娩年龄");
	2093	+ if ("1000000115".equals(hospital)) {
	2094	+ cnames.put("cardNo", "身份证");
	2095	+ cnames.put("vcCardNo", "就诊卡号");
	2096	+ }
2071	2097	cnames.put("dueWeek", "分娩日期");
2072	2098	if ("2100001377".equals(hospital)) {
2073	2099	cnames.put("bTime", "建档时间");

...	...	@@ -16,6 +16,13 @@
16	16	*/
17	17	public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patients> {
18	18	public static final String SPIT = "-";
	19	+
	20	+ /**
	21	+ * 身份证号码
	22	+ */
	23	+ private String cardNo;
	24	+
	25	+ private String vcCardNo;
19	26	//预约住院分娩医院(滦平定制)
20	27	private String yyzyfmHospitalId;
21	28
...	...	@@ -100,6 +107,22 @@
100	107	private String cyxj;
101	108	private String chfs;
102	109	private String chfc;
	110	+
	111	+ public String getCardNo() {
	112	+ return cardNo;
	113	+ }
	114	+
	115	+ public void setCardNo(String cardNo) {
	116	+ this.cardNo = cardNo;
	117	+ }
	118	+
	119	+ public String getVcCardNo() {
	120	+ return vcCardNo;
	121	+ }
	122	+
	123	+ public void setVcCardNo(String vcCardNo) {
	124	+ this.vcCardNo = vcCardNo;
	125	+ }
103	126
104	127	public List<Map> getrLevel() {
105	128	return rLevel;

...	...	@@ -87,6 +87,28 @@
87	87	private String firstCheckDoctor;
88	88	//初诊时间
89	89	private String firstCheckTime;
	90	+ /**
	91	+ * 身份证号码
	92	+ */
	93	+ private String cardNo;
	94	+
	95	+ private String vcCardNo;
	96	+
	97	+ public String getCardNo() {
	98	+ return cardNo;
	99	+ }
	100	+
	101	+ public void setCardNo(String cardNo) {
	102	+ this.cardNo = cardNo;
	103	+ }
	104	+
	105	+ public String getVcCardNo() {
	106	+ return vcCardNo;
	107	+ }
	108	+
	109	+ public void setVcCardNo(String vcCardNo) {
	110	+ this.vcCardNo = vcCardNo;
	111	+ }
90	112
91	113	public String getFirstCheckDoctor() {
92	114	return firstCheckDoctor;

...	...	@@ -47,7 +47,12 @@
47	47	//登记人
48	48	private String lName;
49	49	private String pid;
	50	+ /**
	51	+ * 身份证号码
	52	+ */
	53	+ private String cardNo;
50	54
	55	+ private String vcCardNo;
51	56	public String getPid() {
52	57	return pid;
53	58	}
...	...	@@ -110,6 +115,22 @@
110	115
111	116	public String getCreatedWeek() {
112	117	return createdWeek;
	118	+ }
	119	+
	120	+ public String getCardNo() {
	121	+ return cardNo;
	122	+ }
	123	+
	124	+ public void setCardNo(String cardNo) {
	125	+ this.cardNo = cardNo;
	126	+ }
	127	+
	128	+ public String getVcCardNo() {
	129	+ return vcCardNo;
	130	+ }
	131	+
	132	+ public void setVcCardNo(String vcCardNo) {
	133	+ this.vcCardNo = vcCardNo;
113	134	}
114	135
115	136	public void setCreatedWeek(String createdWeek) {

...	...	@@ -89,6 +89,9 @@
89	89	for (Patients patients : patientses) {
90	90	StopWatch stopWatch = new StopWatch("QuanChanPatientWorker -" + patients.getId());
91	91	QuanChanResult chanResult = new QuanChanResult();
	92	+ chanResult.setVcCardNo(patients.getVcCardNo());
	93	+ chanResult.setCardNo(patients.getCardNo());
	94	+
92	95	chanResult.setYi("-");
93	96	chanResult.setEr("-");
94	97	chanResult.setSan("-");

...	...	@@ -75,6 +75,9 @@
75	75
76	76	StopWatch stopWatch = new StopWatch("QuanPatientWorker -" + patients.getId());
77	77	QuanPatientsResult quanPatientsResult = new QuanPatientsResult();
	78	+ quanPatientsResult.setVcCardNo(patients.getVcCardNo());
	79	+ quanPatientsResult.setCardNo(patients.getCardNo());
	80	+
78	81	quanPatientsResult.setYi("-");
79	82	quanPatientsResult.setEr("-");
80	83	quanPatientsResult.setSan("-");

...	...	@@ -73,6 +73,8 @@
73	73	StopWatch stopWatch = new StopWatch("WorkHR -" + patients.getId());
74	74	RiskPatientsResult riskPatientsResult = new RiskPatientsResult();
75	75	riskPatientsResult.convertToResult(patients);
	76	+ riskPatientsResult.setVcCardNo(patients.getVcCardNo());
	77	+ riskPatientsResult.setCardNo(patients.getCardNo());
76	78	if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
77	79	if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
78	80	Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));