jiangjiazhi / regional-platform

Commit f09b9ec58f173532f9b9fd2715dcf6725bd5a1a5

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

衡水妇幼对接儿童档案

Showing 6 changed files with 319 additions and 375 deletions

platform-common/src/main/java/com/lyms/platform/common/Test.java
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/LisWorkerService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java

...	...	@@ -13,28 +13,29 @@
13	13	public class Test {
14	14
15	15	public static void main(String[] args) throws UnsupportedEncodingException {
16		- Socket socket=null;
17		- PrintWriter out=null;
18		- BufferedReader in=null;
19		- String serverIP="127.0.0.1"; //服务器端ip地址
20		- int port=9999; //服务器端端口号
21		- try
22		- {
23		- socket=new Socket(serverIP,port);
24		- in=new BufferedReader(new InputStreamReader(socket.getInputStream()));
25		- out=new PrintWriter(socket.getOutputStream(),true);
26		-
27		- int number=(int)(Math.random()*10)+1;
28		- System.out.println("客户端正在发送的内容为："+number);
29		-
30		- out.println(number);
31		- Thread.sleep(20L);
32		- }
33		- catch(IOException \| InterruptedException e)
34		- {
35		- // TODO 自动生成的 catch 块
36		- e.printStackTrace();
37		- }
	16	+ System.out.println("河北省承德市宽城满族自治".substring(0,50));
	17	+// Socket socket=null;
	18	+// PrintWriter out=null;
	19	+// BufferedReader in=null;
	20	+// String serverIP="127.0.0.1"; //服务器端ip地址
	21	+// int port=9999; //服务器端端口号
	22	+// try
	23	+// {
	24	+// socket=new Socket(serverIP,port);
	25	+// in=new BufferedReader(new InputStreamReader(socket.getInputStream()));
	26	+// out=new PrintWriter(socket.getOutputStream(),true);
	27	+//
	28	+// int number=(int)(Math.random()*10)+1;
	29	+// System.out.println("客户端正在发送的内容为："+number);
	30	+//
	31	+// out.println(number);
	32	+// Thread.sleep(20L);
	33	+// }
	34	+// catch(IOException \| InterruptedException e)
	35	+// {
	36	+// // TODO 自动生成的 catch 块
	37	+// e.printStackTrace();
	38	+// }
38	39	}
39	40
40	41	private static Date getStartTime() {

...	...	@@ -1878,10 +1878,11 @@
1878	1878
1879	1879	public static void main(String[] args) {
1880	1880
1881		- Date startDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd( DateUtil.addDay(new Date(), -3)) + " 00:00:00");
1882		- Date endDate = DateUtil.addDay(new Date(), 1);
1883		- System.out.println(getyyyy_MM_dd_hms(startDate));
1884		- System.out.println(getyyyy_MM_dd_hms(endDate));
	1881	+ Date startDate = DateUtil.addMonth(new Date(),-12);
	1882	+ Date endDate = DateUtil.addDay(startDate, 18);
	1883	+ System.out.println(getyyyy_MM_dd(startDate));
	1884	+ System.out.println(getyyyy_MM_dd(endDate));
	1885	+ System.out.println(getyyyy_MM_dd(DateUtil.addMonth(endDate,6)));
1885	1886	//
1886	1887	// Date bir = parseYMD("2021-05-29");
1887	1888	// int i = DateUtil.getBabyAgeMonth(bir, new Date());

...	...	@@ -26,14 +26,8 @@
26	26	ServerSocket serverSocket = new ServerSocket(9999);
27	27	while (true) {
28	28	Socket socket = serverSocket.accept();
29		- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream(), "UTF-8"));
30		- //读取一行数据
31		- String str;
32		-
33		- while ( socket.isClosed() && (str = bufferedReader.readLine()) != null) {
34		- System.out.println(str);
35		- }
36		- socket.close();
	29	+ // 每接收到一个Socket就建立一个新的线程来处理它
	30	+ new Thread(new Task(socket)).start();
37	31	}
38	32	} catch (IOException e) {
39	33	e.printStackTrace();
40	34
41	35
42	36
43	37
44	38
45	39
46	40
...	...	@@ -42,107 +36,34 @@
42	36	}
43	37	}
44	38
45		-
46		- public void receiveLis()
47		- {
48		- Socket socket = null;
49		- InputStream inputStream = null;
50		- BufferedReader br = null;
51		- try {
52		- //创建Socket对象
53		- //下面的代码无异常,去连接服务端
54		- System.out.println("客户端准备连接服务端……");
55		- socket = new Socket("127.0.0.1", 9999);
56		- System.out.println("连接服务器成功,准备发送数据");
57		- ExceptionUtils.catchException("连接服务器成功,准备发送数据");
58		- //获取输入流（字节输入流）
59		- inputStream = socket.getInputStream();
60		- //创建BufferedReader对象
61		- br = new BufferedReader(new InputStreamReader(inputStream));
62		- //创建Scanner对象读取，来读取控制台的数据
63		- //循环读写数据
64		- while (true) {
65		- //读(阻塞数据)
66		- read(br);
67		- }
68		- } catch (IOException e) {
69		- ExceptionUtils.catchException("连接socket异常:" + e.getMessage());
70		- } finally {
71		- //关闭资源
72		- close(br);
73		- close(inputStream);
74		- close(socket);
	39	+ static class Task implements Runnable {
	40	+ private Socket socket;
	41	+ public Task(Socket socket) {
	42	+ this.socket = socket;
75	43	}
76		- }
77		- private static String read(BufferedReader br) {
78		- String s = null;
79		- try {
80		- //读取一行数据
81		- s = br.readLine();
82		- System.out.println("您接收到的数据为:" + s);
83		- ExceptionUtils.catchException("您接收到的数据为:" + s);
84		- return s;
85		- } catch (IOException e) {
86		- ExceptionUtils.catchException("接收数据异常:" + e.getMessage());
87		- }
88		- return "";
89		- }
90		- public static void close(Writer w) {
91		- if (w != null) {
	44	+ @Override
	45	+ public void run() {
92	46	try {
93		- w.close();
94		- } catch (IOException e) {
	47	+ handleSocket();
	48	+ } catch (Exception e) {
95	49	e.printStackTrace();
96	50	}
97	51	}
98		- }
	52	+ private void handleSocket() throws Exception {
99	53
100		- public static void close(Reader r) {
101		- if (r != null) {
102	54	try {
103		- r.close();
104		- } catch (IOException e) {
105		- e.printStackTrace();
106		- }
107		- }
108		- }
109		-
110		- public static void close(OutputStream os) {
111		- if (os != null) {
112		- try {
113		- os.close();
114		- } catch (IOException e) {
115		- e.printStackTrace();
116		- }
117		- }
118		- }
119		-
120		- public static void close(InputStream is) {
121		- if (is != null) {
122		- try {
123		- is.close();
124		- } catch (IOException e) {
125		- e.printStackTrace();
126		- }
127		- }
128		- }
129		-
130		- public static void close(Socket socket) {
131		- if (socket != null) {
132		- try {
	55	+ BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream(), "utf-8"));
	56	+ StringBuilder sb = new StringBuilder();
	57	+ String temp;
	58	+ while ((temp = br.readLine()) != null) {
	59	+ sb.append(temp);
	60	+ }
	61	+ System.out.println("客户端: " + sb);
133	62	socket.close();
134		- } catch (IOException e) {
135		- e.printStackTrace();
136		- }
137		- }
138		- }
	63	+ }catch (Exception e){
139	64
140		- public static void close(ServerSocket serverSocket) {
141		- if (serverSocket != null) {
142		- try {
143		- serverSocket.close();
144		- } catch (IOException e) {
145		- e.printStackTrace();
	65	+ }finally {
	66	+ socket.close();
146	67	}
147	68	}
148	69	}

...	...	@@ -634,6 +634,18 @@
634	634	}
635	635
636	636	public BaseObjectResponse addBabyHsfy(HsfyHisRequest hisRequest) {
	637	+
	638	+ BabyModelQuery query = new BabyModelQuery();
	639	+ query.setMcertNo(hisRequest.getPhone());
	640	+ query.setName(hisRequest.getName());
	641	+ query.setYn(1);
	642	+
	643	+ List<BabyModel> list = babyBookbuildingService.queryBabyBuildByCond(query);
	644	+ if (CollectionUtils.isNotEmpty(list))
	645	+ {
	646	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("data exists");
	647	+ }
	648	+
637	649	BabyBookbuildingAddRequest request = new BabyBookbuildingAddRequest();
638	650	request.setBabyName(hisRequest.getName());
639	651	request.setBabyBirthday(hisRequest.getBirthday());
...	...	@@ -646,7 +658,8 @@
646	658	request.setBuildDate(DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm(hisRequest.getCreated())));
647	659	request.setBuildDoctor("2100005613");
648	660	request.setVcCardNo(hisRequest.getVcCardNo());
649		-
	661	+ request.setMommyCertificateNum(hisRequest.getPhone());
	662	+ request.setMommyCertificateTypeId("57e1dcd3f0f02e7ca519d6c6");
650	663	return addBabyBookbuilding(request,2100005613);
651	664	}
652	665

...	...	@@ -65,250 +65,251 @@
65	65
66	66
67	67	public BaseObjectResponse getMsgcC101(String startDate, String endDate) {
68		- //查询条件
69		- ResidentsArchiveQuery query = new ResidentsArchiveQuery();
70		- query.setYn(YnEnums.YES.getId());
71		- if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
72		- query.setBuildDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)));
73		- query.setBuildDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));
74		- }else {
75		- //默认获取当天数据
76		- query.setBuildDateStart(DateUtil.getDayFirstSecond(new Date()));
77		- query.setBuildDateEnd(DateUtil.getDayLastSecond(new Date()));
78		- }
79		- //只查询女性
80		- query.setSex(SystemConfig.WOMAN_ID);
81		-
82		- List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
83	68	List<Map> data = new ArrayList<>();
84		- for (ResidentsArchiveModel model : modelList) {
85		- try {
86		- Map<String, Object> map = new HashMap<>();
87		- //id
88		- map.put("id",StringUtils.isNotEmpty(model.getId())?model.getId():"/");
89		- //档案编号
90		- map.put("file_number",null);
91		- //纸质档案编号
92		- map.put("file_number_paper",null);
93		- //证件类型（lyms_basicconfig表中查"parentId": "c914bb2e-1825-4036-8a41-fe617c90d405"）
94		- String credentials_type_code="99";
95		- if(StringUtils.isNotEmpty(model.getCertificateTypeId())){
96		- switch (model.getCertificateTypeId()){
97		- case "70ae1d93-2964-46bc-83fa-bec9ff605b1c":
98		- //身份证
99		- credentials_type_code="1";
100		- break;
101		- case "5797135b0cf2dd415ca09fe1":
102		- //护照
103		- credentials_type_code="3";
104		- break;
105		- case "efa9ede5-bd40-42bb-8966-a0bf4c20d8fb":
106		- //军官证
107		- credentials_type_code="1";
108		- break;
109		- }
110		- }
111		- map.put("credentials_type_code",credentials_type_code);
112		- //其他身份证件名称
113		- map.put("other_credentials_type",null);
114		- //证件号码
115		- map.put("credentials_number",StringUtils.isNotEmpty(model.getCertificateNum())?model.getCertificateNum():"/");
116		- //出生日期
117		- String birthday=DateUtil.getyyyy_MM_dd_hms(model.getBirthday());
118		- if(StringUtils.isEmpty(birthday)){
119		- if(StringUtils.isNotEmpty(model.getCertificateNum())){
120		- //用身份证获取
121		- birthday=DateUtil.getBirthFromIdCard(model.getCertificateNum());
122		- if(StringUtils.isEmpty(birthday)){
123		- birthday=DateUtil.getyyyy_MM_dd_hms(new Date());
124		- }
125		- }else {
126		- birthday=DateUtil.getyyyy_MM_dd_hms(new Date());
127		- }
128		- }
129		- map.put("birthday",birthday);
130		- //姓名
131		- map.put("name",StringUtils.isNotEmpty(model.getUsername())?model.getUsername():"/");
132		- //姓名简拼
133		- map.put("en_name",null);
134		- //所属民族
135		- String nation_code= CdGwNationEnums.getId(getBasicConfig(model.getNationId()));
136		- map.put("nation_code",StringUtils.isNotEmpty(nation_code)?nation_code:"99");
137		- //性别
138		- map.put("gender_code","2");
139		- //工作单位
140		- map.put("work_unit",StringUtils.isNotEmpty(model.getWorkUnit())?model.getWorkUnit():null);
141		- //固定电话
142		- map.put("tel",null);
143		- //手机号
144		- map.put("phone",StringUtils.isNotEmpty(model.getPhone())?model.getPhone():"/");
145		- //联系人姓名
146		- map.put("contact_name",null);
147		- //联系人电话
148		- map.put("contact_phone",null);
149		- //是否常驻
150		- map.put("is_permanent_code",null);
151		- //流动情况
152		- map.put("permanent_type_code",null);
	69	+// //查询条件
	70	+// ResidentsArchiveQuery query = new ResidentsArchiveQuery();
	71	+// query.setYn(YnEnums.YES.getId());
	72	+// if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
	73	+// query.setBuildDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)));
	74	+// query.setBuildDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));
	75	+// }else {
	76	+// //默认获取当天数据
	77	+// query.setBuildDateStart(DateUtil.getDayFirstSecond(new Date()));
	78	+// query.setBuildDateEnd(DateUtil.getDayLastSecond(new Date()));
	79	+// }
	80	+// //只查询女性
	81	+// query.setSex(SystemConfig.WOMAN_ID);
	82	+//
	83	+// List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
	84	+// List<Map> data = new ArrayList<>();
	85	+// for (ResidentsArchiveModel model : modelList) {
	86	+// try {
	87	+// Map<String, Object> map = new HashMap<>();
	88	+// //id
	89	+// map.put("id",StringUtils.isNotEmpty(model.getId())?model.getId():"/");
	90	+// //档案编号
	91	+// map.put("file_number",null);
	92	+// //纸质档案编号
	93	+// map.put("file_number_paper",null);
	94	+// //证件类型（lyms_basicconfig表中查"parentId": "c914bb2e-1825-4036-8a41-fe617c90d405"）
	95	+// String credentials_type_code="99";
	96	+// if(StringUtils.isNotEmpty(model.getCertificateTypeId())){
	97	+// switch (model.getCertificateTypeId()){
	98	+// case "70ae1d93-2964-46bc-83fa-bec9ff605b1c":
	99	+// //身份证
	100	+// credentials_type_code="1";
	101	+// break;
	102	+// case "5797135b0cf2dd415ca09fe1":
	103	+// //护照
	104	+// credentials_type_code="3";
	105	+// break;
	106	+// case "efa9ede5-bd40-42bb-8966-a0bf4c20d8fb":
	107	+// //军官证
	108	+// credentials_type_code="1";
	109	+// break;
	110	+// }
	111	+// }
	112	+// map.put("credentials_type_code",credentials_type_code);
	113	+// //其他身份证件名称
	114	+// map.put("other_credentials_type",null);
	115	+// //证件号码
	116	+// map.put("credentials_number",StringUtils.isNotEmpty(model.getCertificateNum())?model.getCertificateNum():"/");
	117	+// //出生日期
	118	+// String birthday=DateUtil.getyyyy_MM_dd_hms(model.getBirthday());
	119	+// if(StringUtils.isEmpty(birthday)){
	120	+// if(StringUtils.isNotEmpty(model.getCertificateNum())){
	121	+// //用身份证获取
	122	+// birthday=DateUtil.getBirthFromIdCard(model.getCertificateNum());
	123	+// if(StringUtils.isEmpty(birthday)){
	124	+// birthday=DateUtil.getyyyy_MM_dd_hms(new Date());
	125	+// }
	126	+// }else {
	127	+// birthday=DateUtil.getyyyy_MM_dd_hms(new Date());
	128	+// }
	129	+// }
	130	+// map.put("birthday",birthday);
	131	+// //姓名
	132	+// map.put("name",StringUtils.isNotEmpty(model.getUsername())?model.getUsername():"/");
	133	+// //姓名简拼
	134	+// map.put("en_name",null);
	135	+// //所属民族
	136	+// String nation_code= CdGwNationEnums.getId(getBasicConfig(model.getNationId()));
	137	+// map.put("nation_code",StringUtils.isNotEmpty(nation_code)?nation_code:"99");
	138	+// //性别
	139	+// map.put("gender_code","2");
	140	+// //工作单位
	141	+// map.put("work_unit",StringUtils.isNotEmpty(model.getWorkUnit())?model.getWorkUnit():null);
	142	+// //固定电话
	143	+// map.put("tel",null);
	144	+// //手机号
	145	+// map.put("phone",StringUtils.isNotEmpty(model.getPhone())?model.getPhone():"/");
	146	+// //联系人姓名
	147	+// map.put("contact_name",null);
	148	+// //联系人电话
	149	+// map.put("contact_phone",null);
	150	+// //是否常驻
	151	+// map.put("is_permanent_code",null);
	152	+// //流动情况
	153	+// map.put("permanent_type_code",null);
	154	+//
	155	+// //户籍类型（lyms_basicconfig表中查"parentId": "57624ba30cf23d4631523e9d"）
	156	+// String address_type_code="2";
	157	+// if(StringUtils.isNotEmpty(model.getCensusTypeId())){
	158	+// switch (model.getCensusTypeId()){
	159	+// case "57624bf90cf23d4631523e9e":
	160	+// //非农业户口
	161	+// address_type_code="2";
	162	+// break;
	163	+// case "57624c090cf23d4631523e9f":
	164	+// //农业户口
	165	+// address_type_code="1";
	166	+// break;
	167	+// }
	168	+// }
	169	+// map.put("census_register_type_code",address_type_code);
	170	+// //居住类型
	171	+// map.put("address_type_code",null);
	172	+// //户籍区划编码
	173	+// map.put("residence_district_id",null);
	174	+// //户籍地址区划详情
	175	+// map.put("residence_district_detail",null);
	176	+// //户籍地址
	177	+// map.put("residence_address",null);
	178	+// //身份证住址
	179	+// map.put("id_card_address",null);
	180	+// //年龄
	181	+// Integer age=model.getAge();
	182	+// if(null==model.getAge()){
	183	+// if(StringUtils.isNotEmpty(model.getCertificateNum())){
	184	+// //用身份证获取
	185	+// age=DateUtil.getAgeForIdcard(model.getCertificateNum());
	186	+// }
	187	+// }
	188	+// map.put("age",age);
	189	+// //身高(cm)系统中不能获取没有就传最小取值
	190	+// map.put("height",20);
	191	+// //血型
	192	+// map.put("blood_type_code",null);
	193	+// //RH阴性
	194	+// map.put("blood_type_rh_code",null);
	195	+// //文化程度（lyms_basicconfig表中查"parentId": "8046934b-ebe8-4037-98b6-a9ec47996700"）
	196	+// String edu_attainment_code="10";
	197	+// if(StringUtils.isNotEmpty(model.getLevelTypeId())){
	198	+// switch (model.getLevelTypeId()){
	199	+// case "b819b01b-fc48-4ce7-b623-c2a3b56ffc91":
	200	+// //研究生(博士后)
	201	+// edu_attainment_code="1";
	202	+// break;
	203	+// case "15555f3c-4f11-4473-b289-ba20b2e37161":
	204	+// //研究生（博士）
	205	+// edu_attainment_code="1";
	206	+// break;
	207	+// case "c88bb1f0-9a75-4ad4-9ac8-0b04fa2701c7":
	208	+// //研究生（硕士）
	209	+// edu_attainment_code="1";
	210	+// break;
	211	+// case "11b87441-c63c-419b-b2d0-d968a002f4ce":
	212	+// //大学本科
	213	+// edu_attainment_code="2";
	214	+// break;
	215	+// case "7e49120b-ec92-44c4-b77c-5fb151a7bdd4":
	216	+// //大学专科和专科学校
	217	+// edu_attainment_code="3";
	218	+// break;
	219	+// case "ec0fd0b3-f404-4c50-887f-28baa31b3870":
	220	+// //中等专业学校
	221	+// edu_attainment_code="4";
	222	+// break;
	223	+// case "6c95f456-3e9e-45f4-bdef-04fd0ce4daf7":
	224	+// //技工学校
	225	+// edu_attainment_code="5";
	226	+// break;
	227	+// case "baa86f20-535a-4874-b09d-9f5ae8d89a5d":
	228	+// //高中
	229	+// edu_attainment_code="6";
	230	+// break;
	231	+// case "7a8f2edf-ef69-494f-95a3-c98149c35978":
	232	+// //初中
	233	+// edu_attainment_code="7";
	234	+// break;
	235	+// case "4250cdba-2d25-41ef-acf8-ebbde48156b2":
	236	+// //小学
	237	+// edu_attainment_code="8";
	238	+// break;
	239	+// case "b4157251-2fbc-4d70-b32f-d78e1b4f9251":
	240	+// //文盲或半文盲
	241	+// edu_attainment_code="9";
	242	+// break;
	243	+// }
	244	+// }
	245	+// map.put("edu_attainment_code",edu_attainment_code);
	246	+// //职业
	247	+// map.put("profession_code",null);
	248	+// //婚姻状况（lyms_basicconfig表中查"parentId": "0ab3e86b-dfdb-47eb-a58b-a2f2d978b69f"）
	249	+// String marital_status_code="5";
	250	+// if(StringUtils.isNotEmpty(model.getMarriageId())){
	251	+// switch (model.getMarriageId()){
	252	+// case "d049eaaa-7265-4cdb-879f-992ab6320a3a":
	253	+// //未婚
	254	+// marital_status_code="1";
	255	+// break;
	256	+// case "d75d1902-61a5-4a17-a68a-5b8a9826537b":
	257	+// //已婚
	258	+// marital_status_code="2";
	259	+// break;
	260	+// }
	261	+// }
	262	+// map.put("marital_status_code",marital_status_code);
	263	+// //责任医生
	264	+// map.put("doctor_name",null);
	265	+// //建档人
	266	+// String create_doctor="/";
	267	+// if(StringUtils.isNotEmpty(model.getBuildDoctor())) {
	268	+// Users user = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
	269	+// if (null!=user && StringUtils.isNotEmpty(user.getName())) {
	270	+// create_doctor=user.getName();
	271	+// }
	272	+// }
	273	+// map.put("create_doctor",create_doctor);
	274	+// //建档日期
	275	+// map.put("this_date",null!=model.getBuildDay()?DateUtil.getyyyy_MM_dd_hms(model.getBuildDay()):DateUtil.getyyyy_MM_dd_hms(new Date()));
	276	+// //出生人口编码
	277	+// map.put("childbirth_code",null);
	278	+// //是否孕妇
	279	+// map.put("is_gravida",null);
	280	+// //是否产妇
	281	+// map.put("is_puerpera",null);
	282	+// //系统录入时间
	283	+// map.put("entering_time",null!=model.getCreated()?DateUtil.getyyyy_MM_dd_hms(model.getCreated()):DateUtil.getyyyy_MM_dd_hms(new Date()));
	284	+// //所属机构编码
	285	+// String hospital_name = couponMapper.findHospitalNameById(model.getHospitalId());
	286	+// String organ_id=organizationService.getPlatHosNewCode(hospital_name);
	287	+// map.put("organ_id", StringUtils.isNotEmpty(organ_id)?organ_id:"/");
	288	+// //现住址国家区划编码（现住址国家区划编码（村/居委会）取县/区级的编码
	289	+// String areaName="";
	290	+// if(StringUtils.isNotEmpty(model.getAreaId())){
	291	+// areaName=CommonsHelper.getName1(model.getAreaId(), basicConfigService);
	292	+// }
	293	+// if(StringUtils.isNotEmpty(model.getAreaRegisterId()) && StringUtils.isEmpty(areaName)){
	294	+// areaName=CommonsHelper.getName1(model.getAreaRegisterId(), basicConfigService);
	295	+// }
	296	+// map.put("district_nation_code", organizationService.getAreaCode(areaName)+"000");
	297	+// //母亲姓名简拼
	298	+// map.put("mother_en_name",null);
	299	+// //数据上传时间
	300	+//// map.put("import_time",null);
	301	+// //修改时间
	302	+// map.put("last_modified_time",null);
	303	+// //删除状态,0正常，1删除
	304	+// map.put("is_deleted","0");
	305	+// //删除时间
	306	+// map.put("deleted_time",null);
	307	+// data.add(map);
	308	+// } catch (NumberFormatException e) {
	309	+// e.printStackTrace();
	310	+// }
	311	+// }
153	312
154		- //户籍类型（lyms_basicconfig表中查"parentId": "57624ba30cf23d4631523e9d"）
155		- String address_type_code="2";
156		- if(StringUtils.isNotEmpty(model.getCensusTypeId())){
157		- switch (model.getCensusTypeId()){
158		- case "57624bf90cf23d4631523e9e":
159		- //非农业户口
160		- address_type_code="2";
161		- break;
162		- case "57624c090cf23d4631523e9f":
163		- //农业户口
164		- address_type_code="1";
165		- break;
166		- }
167		- }
168		- map.put("census_register_type_code",address_type_code);
169		- //居住类型
170		- map.put("address_type_code",null);
171		- //户籍区划编码
172		- map.put("residence_district_id",null);
173		- //户籍地址区划详情
174		- map.put("residence_district_detail",null);
175		- //户籍地址
176		- map.put("residence_address",null);
177		- //身份证住址
178		- map.put("id_card_address",null);
179		- //年龄
180		- Integer age=model.getAge();
181		- if(null==model.getAge()){
182		- if(StringUtils.isNotEmpty(model.getCertificateNum())){
183		- //用身份证获取
184		- age=DateUtil.getAgeForIdcard(model.getCertificateNum());
185		- }
186		- }
187		- map.put("age",age);
188		- //身高(cm)系统中不能获取没有就传最小取值
189		- map.put("height",20);
190		- //血型
191		- map.put("blood_type_code",null);
192		- //RH阴性
193		- map.put("blood_type_rh_code",null);
194		- //文化程度（lyms_basicconfig表中查"parentId": "8046934b-ebe8-4037-98b6-a9ec47996700"）
195		- String edu_attainment_code="10";
196		- if(StringUtils.isNotEmpty(model.getLevelTypeId())){
197		- switch (model.getLevelTypeId()){
198		- case "b819b01b-fc48-4ce7-b623-c2a3b56ffc91":
199		- //研究生(博士后)
200		- edu_attainment_code="1";
201		- break;
202		- case "15555f3c-4f11-4473-b289-ba20b2e37161":
203		- //研究生（博士）
204		- edu_attainment_code="1";
205		- break;
206		- case "c88bb1f0-9a75-4ad4-9ac8-0b04fa2701c7":
207		- //研究生（硕士）
208		- edu_attainment_code="1";
209		- break;
210		- case "11b87441-c63c-419b-b2d0-d968a002f4ce":
211		- //大学本科
212		- edu_attainment_code="2";
213		- break;
214		- case "7e49120b-ec92-44c4-b77c-5fb151a7bdd4":
215		- //大学专科和专科学校
216		- edu_attainment_code="3";
217		- break;
218		- case "ec0fd0b3-f404-4c50-887f-28baa31b3870":
219		- //中等专业学校
220		- edu_attainment_code="4";
221		- break;
222		- case "6c95f456-3e9e-45f4-bdef-04fd0ce4daf7":
223		- //技工学校
224		- edu_attainment_code="5";
225		- break;
226		- case "baa86f20-535a-4874-b09d-9f5ae8d89a5d":
227		- //高中
228		- edu_attainment_code="6";
229		- break;
230		- case "7a8f2edf-ef69-494f-95a3-c98149c35978":
231		- //初中
232		- edu_attainment_code="7";
233		- break;
234		- case "4250cdba-2d25-41ef-acf8-ebbde48156b2":
235		- //小学
236		- edu_attainment_code="8";
237		- break;
238		- case "b4157251-2fbc-4d70-b32f-d78e1b4f9251":
239		- //文盲或半文盲
240		- edu_attainment_code="9";
241		- break;
242		- }
243		- }
244		- map.put("edu_attainment_code",edu_attainment_code);
245		- //职业
246		- map.put("profession_code",null);
247		- //婚姻状况（lyms_basicconfig表中查"parentId": "0ab3e86b-dfdb-47eb-a58b-a2f2d978b69f"）
248		- String marital_status_code="5";
249		- if(StringUtils.isNotEmpty(model.getMarriageId())){
250		- switch (model.getMarriageId()){
251		- case "d049eaaa-7265-4cdb-879f-992ab6320a3a":
252		- //未婚
253		- marital_status_code="1";
254		- break;
255		- case "d75d1902-61a5-4a17-a68a-5b8a9826537b":
256		- //已婚
257		- marital_status_code="2";
258		- break;
259		- }
260		- }
261		- map.put("marital_status_code",marital_status_code);
262		- //责任医生
263		- map.put("doctor_name",null);
264		- //建档人
265		- String create_doctor="/";
266		- if(StringUtils.isNotEmpty(model.getBuildDoctor())) {
267		- Users user = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
268		- if (null!=user && StringUtils.isNotEmpty(user.getName())) {
269		- create_doctor=user.getName();
270		- }
271		- }
272		- map.put("create_doctor",create_doctor);
273		- //建档日期
274		- map.put("this_date",null!=model.getBuildDay()?DateUtil.getyyyy_MM_dd_hms(model.getBuildDay()):DateUtil.getyyyy_MM_dd_hms(new Date()));
275		- //出生人口编码
276		- map.put("childbirth_code",null);
277		- //是否孕妇
278		- map.put("is_gravida",null);
279		- //是否产妇
280		- map.put("is_puerpera",null);
281		- //系统录入时间
282		- map.put("entering_time",null!=model.getCreated()?DateUtil.getyyyy_MM_dd_hms(model.getCreated()):DateUtil.getyyyy_MM_dd_hms(new Date()));
283		- //所属机构编码
284		- String hospital_name = couponMapper.findHospitalNameById(model.getHospitalId());
285		- String organ_id=organizationService.getPlatHosNewCode(hospital_name);
286		- map.put("organ_id", StringUtils.isNotEmpty(organ_id)?organ_id:"/");
287		- //现住址国家区划编码（现住址国家区划编码（村/居委会）取县/区级的编码
288		- String areaName="";
289		- if(StringUtils.isNotEmpty(model.getAreaId())){
290		- areaName=CommonsHelper.getName1(model.getAreaId(), basicConfigService);
291		- }
292		- if(StringUtils.isNotEmpty(model.getAreaRegisterId()) && StringUtils.isEmpty(areaName)){
293		- areaName=CommonsHelper.getName1(model.getAreaRegisterId(), basicConfigService);
294		- }
295		- map.put("district_nation_code", organizationService.getAreaCode(areaName));
296		- //母亲姓名简拼
297		- map.put("mother_en_name",null);
298		- //数据上传时间
299		-// map.put("import_time",null);
300		- //修改时间
301		- map.put("last_modified_time",null);
302		- //删除状态,0正常，1删除
303		- map.put("is_deleted","0");
304		- //删除时间
305		- map.put("deleted_time",null);
306		- data.add(map);
307		- } catch (NumberFormatException e) {
308		- e.printStackTrace();
309		- }
310		- }
311		-
312	313	/***********************************************************************/
313	314	//patient表数据组装
314	315	PatientsQuery patientsQuery = new PatientsQuery();
...	...	@@ -530,7 +531,7 @@
530	531	if(StringUtils.isNotEmpty(model.getAreaId()) && StringUtils.isEmpty(areaName)){
531	532	areaName=CommonsHelper.getName1(model.getAreaId(), basicConfigService);
532	533	}
533		- map.put("district_nation_code", organizationService.getAreaCode(areaName));
	534	+ map.put("district_nation_code", organizationService.getAreaCode(areaName)+"000");
534	535	//母亲姓名简拼
535	536	map.put("mother_en_name",null);
536	537	//数据上传时间
...	...	@@ -739,7 +740,7 @@
739	740	if(StringUtils.isNotEmpty(model.getBabyAreaId()) && StringUtils.isEmpty(areaName)){
740	741	areaName=CommonsHelper.getName1(model.getBabyAreaId(), basicConfigService);
741	742	}
742		- map.put("district_nation_code", organizationService.getAreaCode(areaName));
	743	+ map.put("district_nation_code", organizationService.getAreaCode(areaName)+"000");
743	744	//母亲姓名简拼
744	745	map.put("mother_en_name", null);
745	746	//导入时间（存入数据）
...	...	@@ -979,7 +980,7 @@
979	980	String organ_id=organizationService.getPlatHosNewCode(hospital_name);
980	981	map.put("organ_id", StringUtils.isNotEmpty(organ_id)?organ_id:"/");
981	982	//关联妇女档id
982		- String person_id="/";
	983	+ // String person_id="/";
983	984	// if(StringUtils.isNotEmpty(patients.getCardNo())){
984	985	// ResidentsArchiveQuery query = new ResidentsArchiveQuery();
985	986	// query.setYn(YnEnums.YES.getId());
986	987
...	...	@@ -1143,10 +1144,16 @@
1143	1144	//接生者（接生医生）
1144	1145	String mid_wife="/";
1145	1146	if(StringUtils.isNotEmpty(model.getDeliverDoctor())) {
1146		- Users user = usersService.getUsers(Integer.parseInt(model.getDeliverDoctor()));
1147		- if (null!=user && StringUtils.isNotEmpty(user.getName())) {
1148		- mid_wife=user.getName();
	1147	+ try{
	1148	+ Users user = usersService.getUsers(Integer.parseInt(model.getDeliverDoctor()));
	1149	+ if (null!=user && StringUtils.isNotEmpty(user.getName())) {
	1150	+ mid_wife=user.getName();
	1151	+ }
	1152	+ }catch (Exception e)
	1153	+ {
	1154	+ mid_wife = model.getDeliverDoctor();
1149	1155	}
	1156	+
1150	1157	}
1151	1158	map.put("mid_wife", mid_wife);
1152	1159	//产妇状态

...	...	@@ -2881,6 +2881,7 @@
2881	2881	matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
2882	2882	matDeliverQuery.setPage(childbirthManagerRequest.getPage());
2883	2883	matDeliverQuery.setNeed("need");
	2884	+ System.out.println("========="+matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2884	2885	maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2885	2886	// 这里就设置分页内容
2886	2887	childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());