jiangjiazhi / regional-platform

Commit d6451d51c8698b63d89531493b756d4512ef9b68

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 92 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
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/PatientManagerQueryModel.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/worker/QuanChanPatientWorker.java

...	...	@@ -679,12 +679,18 @@
679	679	header.put("username", "姓名");
680	680	header.put("age", "年龄");
681	681	header.put("buildWeek", "建档孕周");
	682	+ String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
	683	+
	684	+ if ("2100001377".equals(hospitalId)) {
	685	+ header.put("prodDoctor", "初诊时间");
	686	+ header.put("checkTime", "初诊医生");
	687	+ }
682	688	header.put("phone", "联系方式");
683	689
684	690	header.put("husbandName", "丈夫姓名");
685	691	header.put("address", "居住地");
686	692	header.put("addressRegister", "户籍地");
687		- String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
	693	+
688	694	if ("1000000114".equals(hospitalId)) {
689	695	header.put("sendCareMan", "母子保健手册");
690	696	header.put("bookbuildingDate", "发放时间");

...	...	@@ -562,6 +562,12 @@
562	562	BaseListResponse baseListResponse = matDeliverFacade.postpartumDeliver(matdeliverFollowRequest);
563	563	Object object = baseListResponse.getObject();
564	564
	565	+ String hospital = autoMatchFacade.getHospitalId(id);
	566	+ Organization org = null;
	567	+ if(StringUtils.isNotEmpty(hospital)){
	568	+ org = organizationService.getOrganization(Integer.valueOf(hospital));
	569	+ }
	570	+
565	571	Map<String, String> cnames = new LinkedHashMap<>();
566	572	cnames.put("id", "#");
567	573	cnames.put("hospitalCityName", "地市名称");
...	...	@@ -569,6 +575,10 @@
569	575	cnames.put("name", "姓名");
570	576	cnames.put("age", "年龄");
571	577	cnames.put("fmHospital", "分娩医院");
	578	+ //衡水城市限制
	579	+ if(org!=null && "12".equals(org.getCityId())){
	580	+ cnames.put("currentAddress", "访视地址");
	581	+ }
572	582	cnames.put("postViewDay", "产后天数");
573	583	cnames.put("address", "居住地");
574	584	cnames.put("phone", "联系电话");
...	...	@@ -595,6 +605,10 @@
595	605	result.put("name", mf.getName());
596	606	result.put("age", mf.getAge() == null ? "--" : String.valueOf(mf.getAge()));
597	607	result.put("fmHospital", mf.getFmHospital());
	608	+ //衡水城市限制
	609	+ if(org!=null && "12".equals(org.getCityId())){
	610	+ result.put("currentAddress", mf.getCurrentAddress());
	611	+ }
598	612	result.put("postViewDay", mf.getPostViewDay());
599	613	result.put("address", mf.getAddress());
600	614	result.put("phone", mf.getPhone());

...	...	@@ -1864,12 +1864,18 @@
1864	1864	} else if (patientsQueryRequest.getQueryType() == 2) {
1865	1865	listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE);
1866	1866	List list = listResponse.getData();
	1867	+ String hospital = autoMatchFacade.getHospitalId(userId);
1867	1868	for (Object obj : list) {
1868	1869	Map<String, Object> data = new HashMap<>();
1869	1870	QuanChanResult rp = (QuanChanResult) obj;
1870	1871	data.put("name", rp.getName());
1871	1872	data.put("age", rp.getAge());
1872	1873	data.put("dueWeek", rp.getDueWeek());
	1874	+ if("2100001377".equals(hospital)){
	1875	+ data.put("bTime", rp.getbTime());
	1876	+ data.put("createdWeek", rp.getCreatedWeek());
	1877	+ data.put("yyzyfmHospitalId", rp.getYyzyfmHospitalId());
	1878	+ }
1873	1879	data.put("cTime", rp.getcTime());
1874	1880	data.put("rLevel", getLevel(rp.getrLevel()));
1875	1881	data.put("rFactor", rp.getrFactor());
...	...	@@ -1887,6 +1893,11 @@
1887	1893	cnames.put("name", "姓名");
1888	1894	cnames.put("age", "分娩年龄");
1889	1895	cnames.put("dueWeek", "分娩日期");
	1896	+ if("2100001377".equals(hospital)){
	1897	+ cnames.put("bTime", "建档时间");
	1898	+ cnames.put("createdWeek", "建档孕周");
	1899	+ cnames.put("yyzyfmHospitalId", "预约住院分娩医院");
	1900	+ }
1890	1901	cnames.put("rLevel", "高危等级");
1891	1902	cnames.put("rFactor", "高危风险因素");
1892	1903	cnames.put("cTime", "产后时间");
...	...	@@ -2233,7 +2244,7 @@
2233	2244
2234	2245	public PatientManagerResult patientManager(PatientManagerRequest patientManagerRequest) {
2235	2246	PatientManagerResult patientManagerResult = new PatientManagerResult();
2236		-
	2247	+ String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
2237	2248	PatientsQuery patientsQuery = new PatientsQuery();
2238	2249	patientsQuery.setScreening(patientManagerRequest.getScreening());
2239	2250
...	...	@@ -2279,7 +2290,7 @@
2279	2290	//排查本院隐藏建档
2280	2291	patientsQuery.setExtEnable(false);
2281	2292	patientsQuery.setBuildTypeNot(1);
2282		- patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()));
	2293	+ patientsQuery.setHospitalId(hospitalId);
2283	2294	patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());
2284	2295	patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId());
2285	2296	patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaRegisterId()) ? null : patientManagerRequest.getAreaRegisterId());
...	...	@@ -2356,7 +2367,25 @@
2356	2367	System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor());
2357	2368	}
2358	2369	}
2359		-
	2370	+ //滦平定制
	2371	+ if("2100001377".equals(hospitalId)){
	2372	+ //初诊
	2373	+ AntExChuQuery antExChuQuery = new AntExChuQuery();
	2374	+ antExChuQuery.setYn(YnEnums.YES.getId());
	2375	+ antExChuQuery.setHospitalId(hospitalId);
	2376	+ antExChuQuery.setParentId(patients.getId());
	2377	+ List<AntExChuModel> antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery());
	2378	+ if(CollectionUtils.isNotEmpty(antExChuModelList)){
	2379	+ AntExChuModel antExChuModel = antExChuModelList.get(0);
	2380	+ if(StringUtils.isNotEmpty(antExChuModel.getProdDoctor())){
	2381	+ Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor()));
	2382	+ if(users != null){
	2383	+ patientManagerQueryModel.setProdDoctor(users.getName());
	2384	+ }
	2385	+ }
	2386	+ patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd( antExChuModel.getCheckTime()));
	2387	+ }
	2388	+ }
2360	2389
2361	2390	patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor);
2362	2391	patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));

...	...	@@ -6,7 +6,12 @@
6	6	* @discription
7	7	*/
8	8	public class PatientManagerQueryModel {
	9	+ //初诊时间
	10	+ private String checkTime;
	11	+ //初诊医生
	12	+ private String prodDoctor;
9	13
	14	+
10	15	/**
11	16	* @auther HuJiaqi
12	17	* @createTime 2016年12月20日 14时42分
...	...	@@ -106,6 +111,22 @@
106	111
107	112	public String getId() {
108	113	return id;
	114	+ }
	115	+
	116	+ public String getCheckTime() {
	117	+ return checkTime;
	118	+ }
	119	+
	120	+ public void setCheckTime(String checkTime) {
	121	+ this.checkTime = checkTime;
	122	+ }
	123	+
	124	+ public String getProdDoctor() {
	125	+ return prodDoctor;
	126	+ }
	127	+
	128	+ public void setProdDoctor(String prodDoctor) {
	129	+ this.prodDoctor = prodDoctor;
109	130	}
110	131
111	132	public void setId(String id) {

...	...	@@ -16,6 +16,9 @@
16	16	*/
17	17	public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patients> {
18	18	public static final String SPIT = "-";
	19	+ //预约住院分娩医院(滦平定制)
	20	+ private String yyzyfmHospitalId;
	21	+
19	22	//分娩记录加住院管床大夫
20	23	private String gcdfDoctorId;
21	24
...	...	@@ -338,6 +341,14 @@
338	341
339	342	public String getRealPhone() {
340	343	return realPhone;
	344	+ }
	345	+
	346	+ public String getYyzyfmHospitalId() {
	347	+ return yyzyfmHospitalId;
	348	+ }
	349	+
	350	+ public void setYyzyfmHospitalId(String yyzyfmHospitalId) {
	351	+ this.yyzyfmHospitalId = yyzyfmHospitalId;
341	352	}
342	353
343	354	public void setRealPhone(String realPhone) {

...	...	@@ -12,6 +12,7 @@
12	12	import com.lyms.platform.operate.web.result.HighScoreResult;
13	13	import com.lyms.platform.operate.web.result.QuanChanResult;
14	14	import com.lyms.platform.operate.web.utils.CommonsHelper;
	15	+import com.lyms.platform.permission.model.Organization;
15	16	import com.lyms.platform.permission.model.Users;
16	17	import com.lyms.platform.permission.service.OrganizationService;
17	18	import com.lyms.platform.permission.service.UsersService;
...	...	@@ -94,6 +95,12 @@
94	95	chanResult.setSi("-");
95	96	chanResult.setWu("-");
96	97	chanResult.convertToResult(patients);
	98	+ if(StringUtils.isNotEmpty(patients.getYyzyfmHospitalId())){
	99	+ String organizationName = organizationService.getOrganizationName(patients.getYyzyfmHospitalId());
	100	+ if(StringUtils.isNotEmpty(organizationName)){
	101	+ chanResult.setYyzyfmHospitalId(organizationName);
	102	+ }
	103	+ }
97	104	//antExQuery.setParentId(patients.getId());
98	105	antExQuery.setPid(patients.getPid());
99	106	antExQuery.setYn(YnEnums.YES.getId());