jiangjiazhi / regional-platform

Commit e1b0e7e79e1ef6e37642934fe9f424bb435e46a7

Authored by Administrator over 6 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 16 additions and 12 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java

...	...	@@ -47,7 +47,7 @@
47	47	}
48	48
49	49	public static void main(String[] ages) {
50		- List<String> addrs = AddressUtil.getAddress("山东省荣成市曙光东区26号207室");
	50	+ List<String> addrs = AddressUtil.getAddress("山东省荣成市曙光东县26号207室");
51	51	for (String ad : addrs) {
52	52	System.out.println(ad);
53	53	}

...	...	@@ -489,8 +489,9 @@
489	489	header.put("babyHeight", "身长cm");
490	490	header.put("babyWeight", "体重g");
491	491	header.put("fmDate", "出生时间(具体到分)");
492		- header.put("addressRegister", "产妇户籍地");
493		- header.put("liveAddress", "居住地");
	492	+
	493	+ header.put("liveAddress", "产妇户籍地");
	494	+ header.put("addressRegister", "居住地");
494	495	header.put("postRest", "产后休养地址");
495	496	header.put("riskLevel", "妊娠风险评估五色分级情况");
496	497	header.put("risk", "妊娠期高危因素");

...	...	@@ -908,6 +908,7 @@
908	908	}
909	909
910	910
	911	+
911	912	/**
912	913	* 秦皇岛电子病历接口
913	914	*

...	...	@@ -15,22 +15,22 @@
15	15	import java.util.concurrent.atomic.AtomicInteger;
16	16
17	17	/**
18		- *
19	18	* @Author dongqin
20	19	* @Description 分娩导出
21	20	* @Date 8:42 2019/5/24
22	21	*/
23	22
24		-public class MatDeliverWorker implements Runnable{
	23	+public class MatDeliverWorker implements Runnable {
25	24	private PatientsService patientsService;
26	25	private ChildbirthManagerQueryModel queryModel;
27	26	private BasicConfigService basicConfigService;
28	27	private AntenatalExaminationFacade antenatalExaminationFacade;
29	28	private List<Map<String, Object>> list;
30	29	private AtomicInteger atomicInteger;
	30	+
31	31	public MatDeliverWorker(PatientsService patientsService, ChildbirthManagerQueryModel queryModel,
32	32	BasicConfigService basicConfigService, AntenatalExaminationFacade antenatalExaminationFacade,
33		- List<Map<String, Object>> list, AtomicInteger atomicInteger){
	33	+ List<Map<String, Object>> list, AtomicInteger atomicInteger) {
34	34	this.patientsService = patientsService;
35	35	this.queryModel = queryModel;
36	36	this.basicConfigService = basicConfigService;
...	...	@@ -44,7 +44,7 @@
44	44	public void run() {
45	45	try {
46	46	setExcelDate();
47		- }catch (Exception t){
	47	+ } catch (Exception t) {
48	48	t.fillInStackTrace();
49	49	}
50	50
...	...	@@ -68,7 +68,8 @@
68	68	//居住地
69	69	String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
70	70	patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService);
71		- map.put("liveAddress", liveAddress);
	71	+
	72	+ map.put("regAddress", liveAddress);
72	73	String regAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(),
73	74	patients.getCityRegisterId(),
74	75	patients.getAreaRegisterId(),
...	...	@@ -76,7 +77,7 @@
76	77	patients.getAddressRegister(),
77	78	basicConfigService);
78	79
79		- map.put("regAddress", regAddress);
	80	+ map.put("liveAddress", regAddress);
80	81	map.put("phone", queryModel.getPhone());
81	82
82	83	if (null == queryModel.getGravidity()) {
83	84
84	85
...	...	@@ -258,16 +259,17 @@
258	259
259	260	/**
260	261	* 获取 + 阳性/ - 阴性
	262	+ *
261	263	* @param amy
262	264	* @param key
263	265	* @return
264	266	*/
265	267	private String getMyzdVal(Map<String, Object> amy, String key) {
266	268	String str = "";
267		- if (amy != null && amy.size() > 0){
	269	+ if (amy != null && amy.size() > 0) {
268	270	Object object = amy.get(key);
269		- if (object != null){
270		- if (object instanceof String){
	271	+ if (object != null) {
	272	+ if (object instanceof String) {
271	273	str = object.toString();
272	274	}
273	275	}