jiangjiazhi / regional-platform

Commit 915fb27ae0683b96bf9ee5ccf158bc47a5408f59

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

分娩

Showing 2 changed files with 18 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java

...	...	@@ -9,7 +9,8 @@
9	9	private String syxh; // 病人唯一标识
10	10	private String yexh; // //0 传入‘0’
11	11	private String jlrq; // 格式如下：2016071122:15:57
12		- private String ssrq;////出生日期 char（16）格式如下：2016071122:15:57
	12	+ private String ssrq;
	13	+ private String csrq;////出生日期 char（16）格式如下：2016071122:15:57
13	14	private String ssj;////婴儿序号前台填写的婴儿序号
14	15	private String yexb;////婴儿性别传入‘男’或‘女’汉字
15	16	private String rc;//妊娠妊娠几周
...	...	@@ -42,6 +43,14 @@
42	43	private String srks;//输入科室
43	44	private String jsz;//接生者
44	45
	46	+ public String getCsrq() {
	47	+ return csrq;
	48	+ }
	49	+
	50	+ public void setCsrq(String csrq) {
	51	+ this.csrq = csrq;
	52	+ }
	53	+
45	54	public String getSyxh() {
46	55	return trim(syxh);
47	56	}
...	...	@@ -338,6 +347,7 @@
338	347	", yexh='" + yexh + '\'' +
339	348	", jlrq='" + jlrq + '\'' +
340	349	", ssrq='" + ssrq + '\'' +
	350	+ ", csrq='" + csrq + '\'' +
341	351	", ssj='" + ssj + '\'' +
342	352	", yexb='" + yexb + '\'' +
343	353	", rc='" + rc + '\'' +

...	...	@@ -189,7 +189,8 @@
189	189
190	190	String cloumns = " SYXH as syxh,\n" +
191	191	" YEXH as yexh,\n" +
192		- " JLRQ as jlrq,\t\n" +
	192	+ " JLRQ as jlrq,\n" +
	193	+ " CSRQ as csrq,\n" +
193	194	" SSRQ as ssrq,\n" +
194	195	" SSJ as ssj,\n" +
195	196	" yexb as yexb,\n" +
196	197
...	...	@@ -229,9 +230,9 @@
229	230	SimpleDateFormat fmt2 = new SimpleDateFormat("yyyyMMdd");
230	231	SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
231	232	try {
232		- String sql ="select "+cloumns+" from JHMK_FMJL where " +
	233	+ String sql ="select "+cloumns+" from JHMK_FMJL_LYMS where " +
233	234	" CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)" +
234		- " and SYXH not in (select SYXH from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and CCQK is not null and CCQK <> '' " +
	235	+ " and SYXH not in (select SYXH from JHMK_FMJL_LYMS where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and CCQK is not null and CCQK <> '' " +
235	236	" and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ')) ";
236	237
237	238	if (StringUtils.isNotEmpty(syxh))
238	239
...	...	@@ -265,10 +266,10 @@
265	266
266	267	Date dueTime = null;
267	268	try{
268		- dueTime = fmt.parse(item.getJlrq());
	269	+ dueTime = fmt.parse(item.getCsrq());
269	270	}catch (Exception e)
270	271	{
271		- dueTime = fmt2.parse(item.getJlrq());
	272	+ dueTime = fmt2.parse(item.getCsrq());
272	273	}
273	274
274	275
...	...	@@ -417,7 +418,7 @@
417	418	}
418	419	}
419	420
420		- String sql1="select "+cloumns+" from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and CCQK is not null and CCQK <> '' " +
	421	+ String sql1="select "+cloumns+" from JHMK_FMJL_LYMS where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and CCQK is not null and CCQK <> '' " +
421	422	" and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ') and " +
422	423	" CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)";
423	424