jiangjiazhi / regional-platform

Commit d1a7db5ba4c20e16cc4d3f6037f4a93e3e77604e

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 10 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/resources/log4j_config.xml

...	...	@@ -344,7 +344,7 @@
344	344	// }
345	345	// return antExRecordDao.queryRecord(query.addOrder(Sort.Direction.DESC, "checkTime"));
346	346
347		- return queryAntExRecords(antExRecordQuery,Sort.Direction.DESC,"checkTime");
	347	+ return queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "checkTime");
348	348	}
349	349
350	350	public List<AntExRecordModel> queryAntExRecords(AntExRecordQuery antExRecordQuery,Sort.Direction direction,String sortField) {
...	...	@@ -355,7 +355,6 @@
355	355	}
356	356	return antExRecordDao.queryRecord(query.addOrder(direction, sortField));
357	357	}
358		-
359	358
360	359	public Integer count(AntExRecordQuery antExRecordQuery) {
361	360	return antExRecordDao.count(antExRecordQuery.convertToQuery());

...	...	@@ -74,6 +74,7 @@
74	74	CourseTypeModel("CourseTypeModel", 97831039590L),
75	75	PatientCourseModel("PatientCourseModel", 92531039591L),
76	76	ModularFunctionConfigModel("ModularFunctionConfigModel", 97531039991L),
	77	+ BabySieveModel("BabySieveModel", 97531049991L),
77	78	BabyEyeCheck("BabyEyeCheck", 97521039591L);
78	79
79	80	private String cname;

	1	+package com.lyms.platform.pojo;
	2	+
	3	+import com.lyms.platform.beans.SerialIdEnum;
	4	+import com.lyms.platform.common.result.BaseModel;
	5	+import org.springframework.data.mongodb.core.mapping.Document;
	6	+
	7	+import java.util.Date;
	8	+import java.util.List;
	9	+import java.util.Map;
	10	+
	11	+/**
	12	+ * 儿童新筛查
	13	+ *
	14	+ */
	15	+@Document(collection = "lyms_baby_sieve")
	16	+public class BabySieveModel extends BaseModel {
	17	+
	18	+ private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
	19	+
	20	+
	21	+ private String id;
	22	+ //实验号
	23	+ private String testNumber;
	24	+
	25	+ //采血单位
	26	+ private String collectHospitalId;
	27	+
	28	+ //当前登陆操作医院
	29	+ private String currentHospitalId;
	30	+
	31	+ //采血医生
	32	+ private String collectDocterId;
	33	+
	34	+ //采血日期
	35	+ private Date collectDate;
	36	+
	37	+ /**母亲信息*******/
	38	+
	39	+ //母亲姓名
	40	+ private String montherName;
	41	+ //住院号
	42	+ private String zyNo;
	43	+ //母亲身份证号
	44	+ private String montherCardNo;
	45	+ //母亲疾病
	46	+ private String montherDisease;
	47	+
	48	+ //联系方式
	49	+ private String phone;
	50	+ //地址
	51	+ private String address;
	52	+
	53	+ /**母亲信息*******/
	54	+ //儿童出生日期
	55	+ private Date babyBirth;
	56	+
	57	+ //孕周
	58	+ private String dueWeek;
	59	+
	60	+ //分娩方式
	61	+ private String dueType;
	62	+
	63	+ //性别
	64	+ private Integer sex;
	65	+
	66	+ //35种疾病筛查
	67	+ private String diseaseSieve;
	68	+
	69	+ //送检医院
	70	+ private String sendCheckHospitalId;
	71	+
	72	+ //儿童建档主键
	73	+ private String babyId;
	74	+
	75	+ //分娩id
	76	+ private String matdeliverId;
	77	+
	78	+ //孕妇档案id
	79	+ private String patientId;
	80	+
	81	+ //创建时间
	82	+ private Date created;
	83	+ //修改时间
	84	+ private Date modified;
	85	+
	86	+ public String getId() {
	87	+ return id;
	88	+ }
	89	+
	90	+ public void setId(String id) {
	91	+ this.id = id;
	92	+ }
	93	+
	94	+ public String getTestNumber() {
	95	+ return testNumber;
	96	+ }
	97	+
	98	+ public void setTestNumber(String testNumber) {
	99	+ this.testNumber = testNumber;
	100	+ }
	101	+
	102	+ public String getCollectHospitalId() {
	103	+ return collectHospitalId;
	104	+ }
	105	+
	106	+ public void setCollectHospitalId(String collectHospitalId) {
	107	+ this.collectHospitalId = collectHospitalId;
	108	+ }
	109	+
	110	+ public String getCurrentHospitalId() {
	111	+ return currentHospitalId;
	112	+ }
	113	+
	114	+ public void setCurrentHospitalId(String currentHospitalId) {
	115	+ this.currentHospitalId = currentHospitalId;
	116	+ }
	117	+
	118	+ public String getCollectDocterId() {
	119	+ return collectDocterId;
	120	+ }
	121	+
	122	+ public void setCollectDocterId(String collectDocterId) {
	123	+ this.collectDocterId = collectDocterId;
	124	+ }
	125	+
	126	+ public Date getCollectDate() {
	127	+ return collectDate;
	128	+ }
	129	+
	130	+ public void setCollectDate(Date collectDate) {
	131	+ this.collectDate = collectDate;
	132	+ }
	133	+
	134	+ public String getMontherName() {
	135	+ return montherName;
	136	+ }
	137	+
	138	+ public void setMontherName(String montherName) {
	139	+ this.montherName = montherName;
	140	+ }
	141	+
	142	+ public String getZyNo() {
	143	+ return zyNo;
	144	+ }
	145	+
	146	+ public void setZyNo(String zyNo) {
	147	+ this.zyNo = zyNo;
	148	+ }
	149	+
	150	+ public String getMontherCardNo() {
	151	+ return montherCardNo;
	152	+ }
	153	+
	154	+ public void setMontherCardNo(String montherCardNo) {
	155	+ this.montherCardNo = montherCardNo;
	156	+ }
	157	+
	158	+ public String getMontherDisease() {
	159	+ return montherDisease;
	160	+ }
	161	+
	162	+ public void setMontherDisease(String montherDisease) {
	163	+ this.montherDisease = montherDisease;
	164	+ }
	165	+
	166	+ public String getPhone() {
	167	+ return phone;
	168	+ }
	169	+
	170	+ public void setPhone(String phone) {
	171	+ this.phone = phone;
	172	+ }
	173	+
	174	+ public String getAddress() {
	175	+ return address;
	176	+ }
	177	+
	178	+ public void setAddress(String address) {
	179	+ this.address = address;
	180	+ }
	181	+
	182	+ public Date getBabyBirth() {
	183	+ return babyBirth;
	184	+ }
	185	+
	186	+ public void setBabyBirth(Date babyBirth) {
	187	+ this.babyBirth = babyBirth;
	188	+ }
	189	+
	190	+ public String getDueWeek() {
	191	+ return dueWeek;
	192	+ }
	193	+
	194	+ public void setDueWeek(String dueWeek) {
	195	+ this.dueWeek = dueWeek;
	196	+ }
	197	+
	198	+ public String getDueType() {
	199	+ return dueType;
	200	+ }
	201	+
	202	+ public void setDueType(String dueType) {
	203	+ this.dueType = dueType;
	204	+ }
	205	+
	206	+ public Integer getSex() {
	207	+ return sex;
	208	+ }
	209	+
	210	+ public void setSex(Integer sex) {
	211	+ this.sex = sex;
	212	+ }
	213	+
	214	+ public String getDiseaseSieve() {
	215	+ return diseaseSieve;
	216	+ }
	217	+
	218	+ public void setDiseaseSieve(String diseaseSieve) {
	219	+ this.diseaseSieve = diseaseSieve;
	220	+ }
	221	+
	222	+ public String getSendCheckHospitalId() {
	223	+ return sendCheckHospitalId;
	224	+ }
	225	+
	226	+ public void setSendCheckHospitalId(String sendCheckHospitalId) {
	227	+ this.sendCheckHospitalId = sendCheckHospitalId;
	228	+ }
	229	+
	230	+ public String getBabyId() {
	231	+ return babyId;
	232	+ }
	233	+
	234	+ public void setBabyId(String babyId) {
	235	+ this.babyId = babyId;
	236	+ }
	237	+
	238	+ public String getMatdeliverId() {
	239	+ return matdeliverId;
	240	+ }
	241	+
	242	+ public void setMatdeliverId(String matdeliverId) {
	243	+ this.matdeliverId = matdeliverId;
	244	+ }
	245	+
	246	+ public String getPatientId() {
	247	+ return patientId;
	248	+ }
	249	+
	250	+ public void setPatientId(String patientId) {
	251	+ this.patientId = patientId;
	252	+ }
	253	+
	254	+ public Date getCreated() {
	255	+ return created;
	256	+ }
	257	+
	258	+ public void setCreated(Date created) {
	259	+ this.created = created;
	260	+ }
	261	+
	262	+ public Date getModified() {
	263	+ return modified;
	264	+ }
	265	+
	266	+ public void setModified(Date modified) {
	267	+ this.modified = modified;
	268	+ }
	269	+}

...	...	@@ -85,6 +85,25 @@
85	85	private Date createdTimeStart;
86	86	private Date createdTimeEnd;
87	87
	88	+ private Date modifiedStart;
	89	+ private Date modifiedEnd;
	90	+
	91	+ public Date getModifiedStart() {
	92	+ return modifiedStart;
	93	+ }
	94	+
	95	+ public void setModifiedStart(Date modifiedStart) {
	96	+ this.modifiedStart = modifiedStart;
	97	+ }
	98	+
	99	+ public Date getModifiedEnd() {
	100	+ return modifiedEnd;
	101	+ }
	102	+
	103	+ public void setModifiedEnd(Date modifiedEnd) {
	104	+ this.modifiedEnd = modifiedEnd;
	105	+ }
	106	+
88	107	public Date getCreatedTimeStart() {
89	108	return createdTimeStart;
90	109	}
...	...	@@ -198,6 +217,14 @@
198	217	c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
199	218	}else{
200	219	c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
	220	+ }
	221	+ }
	222	+
	223	+ if(null != modifiedStart && modifiedEnd != null){
	224	+ if(null != c){
	225	+ c = c.where("modified").gte(modifiedStart).lte(modifiedEnd);
	226	+ }else{
	227	+ c = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd);
201	228	}
202	229	}
203	230

...	...	@@ -4472,7 +4472,7 @@
4472	4472	public BaseObjectResponse saveXsrFs(String startDate,String endDate){
4473	4473	BaseObjectResponse br = null;
4474	4474	Criteria c = null;
4475		- c = Criteria.where("created").lt(DateUtil.parseYMDHMS(startDate)).lte(DateUtil.parseYMDHMS(endDate));
	4475	+ c = Criteria.where("created").gte(DateUtil.parseYMDHMS(startDate)).lte(DateUtil.parseYMDHMS(endDate));
4476	4476	List<NewbornVisit> visit = mongoTemplate.find(Query.query(c), NewbornVisit.class);
4477	4477	if(visit != null && visit.size() > 0){
4478	4478	for(NewbornVisit newbornVisit : visit){

...	...	@@ -13,6 +13,7 @@
13	13	import com.lyms.platform.permission.service.UsersService;
14	14	import com.lyms.platform.pojo.*;
15	15	import com.lyms.platform.query.*;
	16	+import org.apache.commons.collections.CollectionUtils;
16	17	import org.apache.commons.collections.MapUtils;
17	18	import org.apache.commons.lang.StringUtils;
18	19	import org.springframework.beans.factory.annotation.Autowired;
...	...	@@ -23,6 +24,7 @@
23	24	import org.springframework.stereotype.Service;
24	25
25	26	import javax.management.loading.MLet;
	27	+import java.sql.Types;
26	28	import java.util.ArrayList;
27	29	import java.util.HashMap;
28	30	import java.util.List;
...	...	@@ -56,6 +58,8 @@
56	58	private MatDeliverFollowService matDeliverFollowService;
57	59	@Autowired
58	60	private PostReviewService postReviewService;
	61	+ @Autowired
	62	+ private BabyCheckService babyCheckService;
59	63
60	64	/**
61	65	*孕产登记
...	...	@@ -457,6 +461,92 @@
457	461	map.put("LABORTIME",data.getDueDate());
458	462	map.put("GESTTEEKS",String.valueOf(week));
459	463	map.put("GESTDAYS",String.valueOf(day));
	464	+
	465	+ Map<String, Object> mapcc = new HashMap<>();
	466	+ findProcess(data.getProdprocess(), mapcc);
	467	+ if(StringUtils.isNotEmpty(mapcc.get("one").toString())){
	468	+ int oShi = mapcc.get("one").toString().indexOf("时");
	469	+ if(oShi == -1){
	470	+ int oFen = mapcc.get("one").toString().indexOf("分");
	471	+ if(-1 != oFen){
	472	+ map.put("BIRTHTIME1",mapcc.get("one").toString().substring(0,oFen));
	473	+ }
	474	+ }else{
	475	+ Integer fen = 0;
	476	+ if(StringUtils.isNotEmpty(mapcc.get("one").toString().substring(0,oShi))){
	477	+ fen = Integer.parseInt(mapcc.get("one").toString().substring(0,oShi))*60;
	478	+ }
	479	+ int oFen = mapcc.get("one").toString().indexOf("分");
	480	+ if(-1 != oFen){
	481	+ Integer fen2 = Integer.parseInt(mapcc.get("one").toString().substring(oShi + 1, oFen));
	482	+ map.put("BIRTHTIME1",String.valueOf(fen+fen2));
	483	+ }else{
	484	+ map.put("BIRTHTIME1",String.valueOf(fen));
	485	+ }
	486	+
	487	+ }
	488	+ }
	489	+
	490	+ if(StringUtils.isNotEmpty(mapcc.get("two").toString())){
	491	+ int oShi = mapcc.get("two").toString().indexOf("时");
	492	+ if(oShi == -1){
	493	+ int oFen = mapcc.get("two").toString().indexOf("分");
	494	+ if(-1 != oFen){
	495	+ map.put("BIRTHTIME2",mapcc.get("two").toString().substring(0,oFen));
	496	+ }
	497	+ }else{
	498	+ Integer fen = 0;
	499	+ if(StringUtils.isNotEmpty(mapcc.get("two").toString().substring(0,oShi))){
	500	+ fen = Integer.parseInt(mapcc.get("two").toString().substring(0,oShi))*60;
	501	+ }
	502	+ int oFen = mapcc.get("two").toString().indexOf("分");
	503	+ if(-1 != oFen){
	504	+ Integer fen2 = Integer.parseInt(mapcc.get("two").toString().substring(oShi + 1, oFen));
	505	+ map.put("BIRTHTIME2",String.valueOf(fen+fen2));
	506	+ }else{
	507	+ map.put("BIRTHTIME2",String.valueOf(fen));
	508	+ }
	509	+ }
	510	+ }
	511	+
	512	+ if(StringUtils.isNotEmpty(mapcc.get("three").toString())){
	513	+ int oShi = mapcc.get("three").toString().indexOf("时");
	514	+ if(oShi == -1){
	515	+ int oFen = mapcc.get("three").toString().indexOf("分");
	516	+ if(-1 != oFen){
	517	+ map.put("BIRTHTIME3",mapcc.get("three").toString().substring(0,oFen));
	518	+ }
	519	+ }else{
	520	+ Integer fen = 0;
	521	+ if(StringUtils.isNotEmpty(mapcc.get("three").toString().substring(0,oShi))){
	522	+ fen = Integer.parseInt(mapcc.get("three").toString().substring(0,oShi))*60;
	523	+ }
	524	+
	525	+ int oFen = mapcc.get("three").toString().indexOf("分");
	526	+ if(-1 != oFen){
	527	+ Integer fen2 = Integer.parseInt(mapcc.get("three").toString().substring(oShi + 1, oFen));
	528	+ map.put("BIRTHTIME3",String.valueOf(fen+fen2));
	529	+ }else{
	530	+ map.put("BIRTHTIME3",String.valueOf(fen));
	531	+ }
	532	+ }
	533	+ }
	534	+
	535	+ Map<String, String> totalprocessMap = JsonUtil.getMap(data.getTotalprocess());
	536	+ if(MapUtils.isNotEmpty(totalprocessMap)){
	537	+ String h = totalprocessMap.get("h") == null ? "" : totalprocessMap.get("h");
	538	+ String m = totalprocessMap.get("m") == null ? "" : totalprocessMap.get("m");
	539	+ Integer zShi = 0;
	540	+ Integer zFen = 0;
	541	+ if(StringUtils.isNotEmpty(h)){
	542	+ zShi = Integer.parseInt(h)*60;
	543	+ }
	544	+ if(StringUtils.isNotEmpty(m)){
	545	+ zFen = Integer.parseInt(m)*60;
	546	+ }
	547	+ map.put("BIRTHTOTAL",String.valueOf(zShi+zFen));
	548	+ }
	549	+
460	550	if(data.getPerinealCondition() != null){
461	551	if("full".equals(data.getPerinealCondition())){
462	552	map.put("PERINEUMSITUATION","1");
...	...	@@ -545,8 +635,8 @@
545	635	}
546	636	if(babyModel.getApgarScore() != null){
547	637	Map map1 = JsonUtil.str2Obj(babyModel.getApgarScore(), Map.class);
548		- map.put("BABYAPGAR1",map.get("pf1").toString());
549		- map.put("BABYAPGAR5",map.get("pf5".toString()));
	638	+ map.put("BABYAPGAR1",map1.get("pf1").toString());
	639	+ map.put("BABYAPGAR5",map1.get("pf5").toString());
550	640	}
551	641	map.put("ORGCODE",patients.getHospitalId());
552	642	String hospital = "";
...	...	@@ -708,7 +798,7 @@
708	798	List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
709	799	PostReviewQuery mongoQuery = new PostReviewQuery();
710	800	mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
711		- mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(endDate));
	801	+ mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
712	802	List<PostReviewModel> list = postReviewService.findWithList(mongoQuery);
713	803	if(list != null && list.size() > 0){
714	804	for(PostReviewModel data : list){
...	...	@@ -804,7 +894,7 @@
804	894	public List<Map<String,String>> getXsefs(String startDate,String endDate) {
805	895	List<Map<String, String>> mList = new ArrayList<Map<String, String>>();
806	896	Criteria c = null;
807		- c = Criteria.where("created").lt(DateUtil.parseYMDHMS(startDate)).lte(DateUtil.parseYMDHMS(endDate));
	897	+ c = Criteria.where("created").gte(DateUtil.parseYMDHMS(startDate)).lte(DateUtil.parseYMDHMS(endDate));
808	898	List<NewbornVisit> visit = mongoTemplate.find(Query.query(c), NewbornVisit.class);
809	899	if(visit != null && visit.size() > 0){
810	900	for(NewbornVisit newbornVisit : visit) {
811	901
812	902
813	903
814	904
815	905
...	...	@@ -869,29 +959,44 @@
869	959	}else{
870	960	map.put("MOTHERBIRTHDATE",null);
871	961	}
872		- if(newbornVisit.getCheckTimeDesc() != null){
873		- int days = Integer.parseInt(newbornVisit.getCheckTimeDesc().substring(1, newbornVisit.getCheckTimeDesc().indexOf("周")));
874		- if(days < 7){
	962	+ if(StringUtils.isNotEmpty(newbornVisit.getCheckTimeDesc())){
	963	+ int zhou = newbornVisit.getCheckTimeDesc().indexOf("周");
	964	+ if(-1 == zhou){
875	965	map.put("BIRTHGESTWEEKS",null);
876		- map.put("BIRTHGESTDAYS",String.valueOf(days));
	966	+ int tian = newbornVisit.getCheckTimeDesc().indexOf("天");
	967	+ if(-1 == tian){
	968	+ map.put("BIRTHGESTWEEKS",null);
	969	+ map.put("BIRTHGESTDAYS",null);
	970	+ }else{
	971	+ int day = Integer.parseInt(newbornVisit.getCheckTimeDesc().substring(0, tian));
	972	+ map.put("BIRTHGESTDAYS",String.valueOf(day));
	973	+ }
	974	+
877	975	}else{
878		- int week = days/7;
879		- int day = days%7;
880		- map.put("BIRTHGESTWEEKS",String.valueOf(week));
881		- map.put("BIRTHGESTDAYS",String.valueOf(day));
	976	+ int days = Integer.parseInt(newbornVisit.getCheckTimeDesc().substring(0, newbornVisit.getCheckTimeDesc().indexOf("周")));
	977	+ if(days < 7){
	978	+ map.put("BIRTHGESTWEEKS",null);
	979	+ map.put("BIRTHGESTDAYS",String.valueOf(days));
	980	+ }else{
	981	+ int week = days/7;
	982	+ int day = days%7;
	983	+ map.put("BIRTHGESTWEEKS",String.valueOf(week));
	984	+ map.put("BIRTHGESTDAYS",String.valueOf(day));
	985	+ }
882	986	}
	987	+
883	988	}else{
884	989	map.put("BIRTHGESTWEEKS",null);
885	990	map.put("BIRTHGESTDAYS",null);
886	991	}
887		- String fmhospital = "";
	992	+ /*String fmhospital = "";
888	993	if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getDeliverOrg())) {
889	994	Organization organization = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg()));
890	995	if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
891	996	fmhospital = organization.getName();
892	997	}
893		- }
894		- map.put("DELIVERYORGNAME",fmhospital);
	998	+ }*/
	999	+ map.put("DELIVERYORGNAME",model.getDeliverOrg());
895	1000	map.put("ASPHYXIACODE","1");
896	1001	map.put("APGARSCORECODE",null);
897	1002	map.put("APGARSCORE",null);
898	1003
899	1004
...	...	@@ -1117,8 +1222,370 @@
1117	1222	}
1118	1223
1119	1224
	1225	+ /**
	1226	+ * 儿童体检（儿保）
	1227	+ * @param startDate
	1228	+ * @param endDate
	1229	+ * @return
	1230	+ */
	1231	+ public List<Map<String,String>> getEb(String startDate,String endDate){
	1232	+ List<Map<String, String>> mList = new ArrayList<Map<String, String>>();
	1233	+ BabyCheckModelQuery babyQuery = new BabyCheckModelQuery();
	1234	+ babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
	1235	+ babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
	1236	+ List<BabyCheckModel> list = babyCheckService.queryBabyCheckRecord(babyQuery);
	1237	+ if(list != null && list.size() > 0){
	1238	+ for(BabyCheckModel babyCheckModel : list){
	1239	+ try{
	1240	+ Map<String,String> map = new HashMap<String,String>();
	1241	+ BabyModelQuery babymQuery = new BabyModelQuery();
	1242	+ babymQuery.setId(babyCheckModel.getBuildId());
	1243	+ babymQuery.setYn(YnEnums.YES.getId());
1120	1244
	1245	+ //获取儿童基本信息
	1246	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babymQuery);
	1247	+ if(models != null && models.size()>0) {
	1248	+ BabyModel babyModel = models.get(0);
	1249	+ //获取母亲基本信息
	1250	+ Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
1121	1251
	1252	+ if(babyCheckModel.getCheckMonth() != null && 0 != babyCheckModel.getCheckMonth()){
	1253	+ map.put("CHILDHEALTHEXAMID",babyCheckModel.getId());
	1254	+ map.put("MATERNALINFOID",patients.getId());
	1255	+ map.put("NEWBORNSITUATIONID",babyModel.getId());
	1256	+ map.put("PERSONINFOID",babyModel.getId());
	1257	+ map.put("AGECODE",babyCheckModel.getCheckMonth().toString());
	1258	+ map.put("NEWBORNNAME",babyModel.getName());
	1259	+ map.put("HEIGHT",babyCheckModel.getHeight());
	1260	+ if("上".equals(babyCheckModel.getHeightEvaluate())){
	1261	+ map.put("HEIGHTEVALCODE","1");
	1262	+ }else if("中".equals(babyCheckModel.getHeightEvaluate())){
	1263	+ map.put("HEIGHTEVALCODE","2");
	1264	+ }else if("下".equals(babyCheckModel.getHeightEvaluate())){
	1265	+ map.put("HEIGHTEVALCODE","3");
	1266	+ }
	1267	+ map.put("WEIGHT",babyCheckModel.getWeight());
	1268	+ if("上".equals(babyCheckModel.getWeightEvaluate())){
	1269	+ map.put("WEIGHTEVALCODE","1");
	1270	+ }else if("中".equals(babyCheckModel.getWeightEvaluate())){
	1271	+ map.put("WEIGHTEVALCODE","2");
	1272	+ }else if("下".equals(babyCheckModel.getWeightEvaluate())){
	1273	+ map.put("WEIGHTEVALCODE","3");
	1274	+ }
	1275	+ map.put("WEIGHTDIVHEIGHT",babyCheckModel.getHeightWeight());
	1276	+ map.put("HEADCIRCUMFERENCE",babyCheckModel.getHead());
	1277	+
	1278	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyCheckModel.getGrowthEvaluate()))
	1279	+
	1280	+ {
	1281	+
	1282	+ List<String> lists = JsonUtil.toList(babyCheckModel.getGrowthEvaluate(), String.class);
	1283	+ if (CollectionUtils.isNotEmpty(lists)) {
	1284	+ StringBuffer sb = new StringBuffer();
	1285	+ for (int i = 0, len = lists.size(); i < len; i++) {
	1286	+ if (i != len - 1) {
	1287	+ sb.append(lists.get(i));
	1288	+ sb.append(",");
	1289	+ } else {
	1290	+ sb.append(lists.get(i));
	1291	+ }
	1292	+ }
	1293	+ map.put("PHYSICALDEVELOPEVALCODE",sb.toString());
	1294	+ }
	1295	+ }
	1296	+
	1297	+
	1298	+ if(babyCheckModel.getFaceColor() != null){
	1299	+ Map<String,String> mapsface = JsonUtil.str2Obj(babyCheckModel.getFaceColor(), Map.class);
	1300	+ if(mapsface != null){
	1301	+ if("1".equals(mapsface.get("select"))){
	1302	+ map.put("CHILDCOMPLEXIONCODE","1");
	1303	+ map.put("CHILDCOMPLEXIONVALUE","红润");
	1304	+ }else if("2".equals(mapsface.get("select"))){
	1305	+ map.put("CHILDCOMPLEXIONCODE","2");
	1306	+ if(babyCheckModel.getCheckMonth() >= 6 && babyCheckModel.getCheckMonth() <= 8){
	1307	+ map.put("CHILDCOMPLEXIONVALUE","其他");
	1308	+ }else if(babyCheckModel.getCheckMonth() >= 1 && babyCheckModel.getCheckMonth() <= 3){
	1309	+ map.put("CHILDCOMPLEXIONVALUE","黄染");
	1310	+ }
	1311	+ }else if("3".equals(mapsface.get("select"))){
	1312	+ map.put("CHILDCOMPLEXIONCODE","3");
	1313	+ map.put("CHILDCOMPLEXIONVALUE","其他");
	1314	+ }
	1315	+ }
	1316	+ }
	1317	+
	1318	+ if(babyCheckModel.getSkin() != null){
	1319	+ Map<String,Boolean> mapskin = JsonUtil.str2Obj(babyCheckModel.getSkin(), Map.class);
	1320	+ if(mapskin != null){
	1321	+ if("no".equals(mapskin.get("yesOrNo"))){
	1322	+ map.put("SKINABNORMCODE","1");
	1323	+ map.put("SKINABNORMVALUE",null);
	1324	+ }else if("yes".equals(mapskin.get("yesOrNo"))){
	1325	+ map.put("SKINABNORMCODE","2");
	1326	+ String skinZw = null;
	1327	+ if(true==mapskin.get("sz")){
	1328	+ skinZw+="湿疹";
	1329	+ }
	1330	+ if(true==mapskin.get("hr")){
	1331	+ skinZw+=",黄染";
	1332	+ }
	1333	+ if(true==mapskin.get("fg")){
	1334	+ skinZw+=",发绀";
	1335	+ }
	1336	+ if(true==mapskin.get("qb")){
	1337	+ skinZw+=",苍白";
	1338	+ }
	1339	+ if("true".equals(mapskin.get("mxxgl"))){
	1340	+ skinZw+=",毛细血管瘤";
	1341	+ }
	1342	+ if(true==mapskin.get("bk")){
	1343	+ skinZw+=",包块";
	1344	+ }
	1345	+ if(true==mapskin.get("yz")){
	1346	+ skinZw+=",硬肿";
	1347	+ }
	1348	+ if(true==mapskin.get("hz")){
	1349	+ skinZw+=",红肿";
	1350	+ }
	1351	+ if(true==mapskin.get("ch")){
	1352	+ skinZw+=",潮红";
	1353	+ }
	1354	+ if(true==mapskin.get("ml")){
	1355	+ skinZw+=",糜烂";
	1356	+ }
	1357	+ map.put("SKINABNORMVALUE",skinZw);
	1358	+ }
	1359	+ }
	1360	+ }
	1361	+
	1362	+ if(babyCheckModel.getBregma() != null){
	1363	+ Map mapbre = JsonUtil.str2Obj(babyCheckModel.getBregma(), Map.class);
	1364	+ if("yes".equals(mapbre.get("yesOrNo"))){
	1365	+ map.put("BREGMACLOSECODE","1");
	1366	+ }if("no".equals(mapbre.get("yesOrNo"))){
	1367	+ map.put("BREGMACLOSECODE","2");
	1368	+ map.put("BREGMAHORIZDIAMETER",map.get("wbhcc1"));
	1369	+ map.put("BREGMAVERTDIAMETER",map.get("wbhcc2"));
	1370	+ }
	1371	+ }
	1372	+
	1373	+ if(babyCheckModel.getNeck() != null){
	1374	+ Map mapneck = JsonUtil.str2Obj(babyCheckModel.getNeck(), Map.class);
	1375	+ if("no".equals(mapneck.get("yesOrNo"))){
	1376	+ map.put("NECKMASSCODE","2");
	1377	+ }if("yes".equals(mapneck.get("yesOrNo"))){
	1378	+ map.put("NECKMASSCODE","1");
	1379	+ }
	1380	+ }
	1381	+
	1382	+ if(babyCheckModel.getEye() != null){
	1383	+ if("未见异常".equals(babyCheckModel.getEye())){
	1384	+ map.put("EYEABNORMCODE","1");
	1385	+ map.put("EYEABNORMVALUE",babyCheckModel.getEye());
	1386	+ }else{
	1387	+ map.put("EYEABNORMCODE","2");
	1388	+ map.put("EYEABNORMVALUE",babyCheckModel.getEye());
	1389	+ }
	1390	+ }
	1391	+
	1392	+ if(babyCheckModel.getEar() != null){
	1393	+ if("未见异常".equals(babyCheckModel.getEar())){
	1394	+ map.put("EARABNORMCODE","1");
	1395	+ map.put("EARABNORMVALUE",babyCheckModel.getEar());
	1396	+ }else{
	1397	+ map.put("EARABNORMCODE","2");
	1398	+ map.put("EARABNORMVALUE",babyCheckModel.getEar());
	1399	+ }
	1400	+ }
	1401	+
	1402	+ if(babyCheckModel.getHearing() != null){
	1403	+ Map maphear = JsonUtil.str2Obj(babyCheckModel.getHearing(), Map.class);
	1404	+ if("1".equals(maphear.get("select"))){
	1405	+ map.put("HEARINGSCREENRESULTCODE","2");
	1406	+ }if("0".equals(maphear.get("select"))){
	1407	+ map.put("HEARINGSCREENRESULTCODE","1");
	1408	+ }
	1409	+ }
	1410	+
	1411	+ if(babyCheckModel.getKq() != null){
	1412	+ if("未见异常".equals(babyCheckModel.getKq())){
	1413	+ map.put("ORALABNORMCODE","1");
	1414	+ map.put("ORALABNORMVALUE",babyCheckModel.getKq());
	1415	+ }else{
	1416	+ map.put("ORALABNORMCODE","2");
	1417	+ map.put("ORALABNORMVALUE",babyCheckModel.getKq());
	1418	+ }
	1419	+ }
	1420	+
	1421	+ map.put("TEETHCOUNT",babyCheckModel.getCyNum());
	1422	+ map.put("CARIESCOUNT",babyCheckModel.getQcNum());
	1423	+
	1424	+ if(babyCheckModel.getChest() != null){
	1425	+ Map mapchest = JsonUtil.str2Obj(babyCheckModel.getChest(), Map.class);
	1426	+ if("no".equals(mapchest.get("yesOrNo"))){
	1427	+ map.put("HEARTABNORMCODE","1");
	1428	+ map.put("HEARTABNORMVALUE",babyCheckModel.getChest());
	1429	+ }if("yes".equals(babyCheckModel.getChest())){
	1430	+ map.put("HEARTABNORMCODE","2");
	1431	+ map.put("HEARTABNORMVALUE",babyCheckModel.getChest());
	1432	+ }
	1433	+ }
	1434	+
	1435	+ if(babyCheckModel.getBelly() != null){
	1436	+ if("未见异常".equals(babyCheckModel.getBelly())){
	1437	+ map.put("ABDOMENABNORMCODE","1");
	1438	+ map.put("ABDOMENABNORMVALUE",babyCheckModel.getBelly());
	1439	+ }else{
	1440	+ map.put("ABDOMENABNORMCODE","2");
	1441	+ map.put("ABDOMENABNORMVALUE",babyCheckModel.getBelly());
	1442	+ }
	1443	+ }
	1444	+
	1445	+ Map mapnavel = babyCheckModel.getNavel();
	1446	+ if("1".equals(mapnavel.get("select"))){
	1447	+ map.put("UMBCORDFALLCODE","1");
	1448	+ map.put("UMBCORDFALLVALUE","未脱");
	1449	+ }else if("2".equals(mapnavel.get("select"))){
	1450	+ map.put("UMBCORDFALLCODE","2");
	1451	+ map.put("UMBCORDFALLVALUE","已脱");
	1452	+ }else if("3".equals(mapnavel.get("select"))){
	1453	+ map.put("UMBCORDFALLCODE","3");
	1454	+ map.put("UMBCORDFALLVALUE","脐部有渗出");
	1455	+ }else if("4".equals(mapnavel.get("select"))){
	1456	+ map.put("UMBCORDFALLCODE","4");
	1457	+ map.put("UMBCORDFALLVALUE","其他");
	1458	+ }
	1459	+
	1460	+ if(babyCheckModel.getSpineFours() != null){
	1461	+ if("未见异常".equals(babyCheckModel.getSpineFours())){
	1462	+ map.put("LIMBSABNORMCODE","1");
	1463	+ map.put("LIMBSABNORMVALUE",babyCheckModel.getSpineFours());
	1464	+ }else{
	1465	+ map.put("LIMBSABNORMCODE","1");
	1466	+ map.put("LIMBSABNORMVALUE",babyCheckModel.getSpineFours());
	1467	+ }
	1468	+ }
	1469	+
	1470	+ if(babyCheckModel.getStepStatus() != null){
	1471	+ if("未见异常".equals(babyCheckModel.getStepStatus())){
	1472	+ map.put("GAITABNORMCODE","1");
	1473	+ }else{
	1474	+ map.put("GAITABNORMCODE","2");
	1475	+ }
	1476	+ }
	1477	+
	1478	+ if(babyCheckModel.getPortaGenitals() != null){
	1479	+ Map<String,Boolean> mappor = JsonUtil.str2Obj(babyCheckModel.getPortaGenitals(), Map.class);
	1480	+ if("no".equals(mappor.get("yesOrNo"))){
	1481	+ map.put("ANUSABNORMCODE","1");
	1482	+ }else if("yes".equals(mappor.get("yesOrNo"))){
	1483	+ map.put("ANUSABNORMCODE","2");
	1484	+ String porzw = null;
	1485	+ if(true==mappor.get("ynsz")){
	1486	+ porzw+=",阴囊水肿";
	1487	+ }if(true==mappor.get("xmjy")){
	1488	+ porzw+=",鞘膜积液";
	1489	+ }if(true==mappor.get("ndxy")){
	1490	+ porzw+=",尿道下裂";
	1491	+ }if(true==mappor.get("fggs")){
	1492	+ porzw+=",腹股沟疝";
	1493	+ }if(true==mappor.get("yg")){
	1494	+ porzw+=",隐睾";
	1495	+ }if(true==mappor.get("ycnx")){
	1496	+ porzw+=",阴唇粘连";
	1497	+ }
	1498	+ map.put("ANUSABNORMVALUE",porzw);
	1499	+ }
	1500	+
	1501	+ }
	1502	+
	1503	+ map.put("HGB",babyCheckModel.getHemoglobin());
	1504	+ map.put("OTHERSHEALTHEXAM",babyCheckModel.getBabyCheckOther());
	1505	+ map.put("OUTDOORACTHOURS",babyCheckModel.getActivity());
	1506	+ map.put("VITAMINDNAME",null);
	1507	+ map.put("VITAMINDDOSE",babyCheckModel.getVitaminD());
	1508	+ map.put("DEVELOPPASSCODE",null);
	1509	+ map.put("DEVELOPPASS",null);
	1510	+ map.put("SICKVISITCODE",null);
	1511	+ map.put("FOLLOWUPVISITDATE",DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate()));
	1512	+ map.put("FOLLOWUPDOCTORID",babyCheckModel.getCheckDoctor());
	1513	+ String checkDoctor = "";
	1514	+
	1515	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getCheckDoctor())) {
	1516	+ Users users = usersService.getUsers(Integer.parseInt(babyCheckModel.getCheckDoctor()));
	1517	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1518	+ checkDoctor = users.getName();
	1519	+ }
	1520	+ }
	1521	+ map.put("FOLLOWUPVISITDOCTORNAME",checkDoctor);
	1522	+ map.put("NEXTFOLLOWUPDATE",DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate()));
	1523	+
	1524	+ if(babyCheckModel.getStoopStatus() != null){
	1525	+ Map<String,Boolean> mapsto = JsonUtil.str2Obj(babyCheckModel.getStoopStatus(), Map.class);
	1526	+ if("no".equals(mapsto.get("yesOrNo"))){
	1527	+ map.put("RICKETSSYMPTOMS","1");
	1528	+ }else{
	1529	+ String zhi = null;
	1530	+ if(true==mapsto.get("yj")){
	1531	+ zhi+="2";
	1532	+ }if(true==mapsto.get("dh")){
	1533	+ zhi+=",3";
	1534	+ }if(true==mapsto.get("fz")){
	1535	+ zhi+=",4";
	1536	+ }
	1537	+ map.put("RICKETSSYMPTOMS",zhi);
	1538	+ }
	1539	+ }
	1540	+
	1541	+ if(babyCheckModel.getStoopSign() != null){
	1542	+ Map<String,Boolean> mapsign = JsonUtil.str2Obj(babyCheckModel.getStoopSign(), Map.class);
	1543	+ if("no".equals(mapsign.get("yesOrNo"))){
	1544	+ map.put("RICKETSSIGN68","1");
	1545	+ }else{
	1546	+ String zhi=null;
	1547	+ if(true==mapsign.get("lcz")){
	1548	+ zhi+="2";
	1549	+ }if(true==mapsign.get("lrgg")){
	1550	+ zhi+=",3";
	1551	+ }if(true==mapsign.get("jx")){
	1552	+ zhi+=",4";
	1553	+ }if(true==mapsign.get("szz")){
	1554	+ zhi+=",5";
	1555	+ }
	1556	+ map.put("RICKETSSIGN68",zhi);
	1557	+ }
	1558	+ }
	1559	+
	1560	+ map.put("ORGCODE",babyCheckModel.getHospitalId());
	1561	+ String hospital = "";
	1562	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getHospitalId())) {
	1563	+ Organization organization = organizationService.getOrganization(Integer.parseInt(babyCheckModel.getHospitalId()));
	1564	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	1565	+ hospital = organization.getName();
	1566	+ }
	1567	+ }
	1568	+ map.put("ORGNAME",hospital);
	1569	+
	1570	+ mList.add(map);
	1571	+
	1572	+ }else{
	1573	+ continue;
	1574	+ }
	1575	+
	1576	+ }
	1577	+ }catch (Exception e){
	1578	+ e.printStackTrace();
	1579	+ continue;
	1580	+ }
	1581	+ }
	1582	+ }
	1583	+
	1584	+ return mList;
	1585	+ }
	1586	+
	1587	+
	1588	+
1122	1589	//民族查询
1123	1590	private String getBasicConfig(String id) {
1124	1591	if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) {
...	...	@@ -1130,6 +1597,39 @@
1130	1597	}
1131	1598	return "";
1132	1599	}
	1600	+
	1601	+
	1602	+
	1603	+ //解析1,2,3产程
	1604	+ public static Map<String, Object> findProcess(String process, Map<String, Object> map) {
	1605	+// process = "{\"one\":{\"h\":4,\"m\":20},\"two\":{\"m\":53},\"three\":{\"m\":7}}";
	1606	+ String one = "";
	1607	+ String two = "";
	1608	+ String three = "";
	1609	+ Map<String, Map<String, String>> prodprocessMap = JsonUtil.getDoubleMap(process);
	1610	+ if (MapUtils.isNotEmpty(prodprocessMap)) {
	1611	+ Map<String, String> prodprocessOne = prodprocessMap.get("one");
	1612	+ if (MapUtils.isNotEmpty(prodprocessOne)) {
	1613	+ one = (prodprocessOne.get("h") == null ? "" : prodprocessOne.get("h") + "时") +
	1614	+ (prodprocessOne.get("m") == null ? "" : prodprocessOne.get("m") + "分");
	1615	+ }
	1616	+ Map<String, String> prodprocessTwo = prodprocessMap.get("two");
	1617	+ if (MapUtils.isNotEmpty(prodprocessTwo)) {
	1618	+ two = (prodprocessTwo.get("h") == null ? "" : prodprocessTwo.get("h") + "时")
	1619	+ + (prodprocessTwo.get("m") == null ? "" : prodprocessTwo.get("m") + "分");
	1620	+ }
	1621	+ Map<String, String> prodprocessThree = prodprocessMap.get("three");
	1622	+ if (MapUtils.isNotEmpty(prodprocessThree)) {
	1623	+ three = (prodprocessThree.get("h") == null ? "" : prodprocessThree.get("h") + "时")
	1624	+ + (prodprocessThree.get("m") == null ? "" : prodprocessThree.get("m") + "分");
	1625	+ }
	1626	+ }
	1627	+ map.put("one", one);
	1628	+ map.put("two", two);
	1629	+ map.put("three", three);
	1630	+ return map;
	1631	+ }
	1632	+
1133	1633
1134	1634
1135	1635	}

	1	+package com.lyms.platform.operate.web.controller;
	2	+
	3	+
	4	+import com.lyms.platform.common.base.BaseController;
	5	+
	6	+import org.springframework.stereotype.Controller;
	7	+
	8	+
	9	+/**
	10	+ * 新生儿筛查
	11	+ */
	12	+@Controller
	13	+public class BabySieveController extends BaseController{
	14	+
	15	+
	16	+
	17	+
	18	+}

...	...	@@ -104,12 +104,41 @@
104	104	}
105	105
106	106
	107	+ @RequestMapping(method = RequestMethod.POST,value = "/qhd/xsetj")
	108	+ @ResponseBody
	109	+ public List<Map<String,String>> qhdxinshengertijian(@RequestBody Map<String,String> map){
	110	+ if(StringUtils.isNotEmpty(map.get("startDate")) && StringUtils.isNotEmpty(map.get("endDate"))){
	111	+ return qhdJbgwInterface.getEb(map.get("startDate"), map.get("endDate"));
	112	+ }
	113	+ return null;
	114	+ }
107	115
	116	+
	117	+
108	118	@RequestMapping(value = "/qhd/chuzhen")
109	119	@ResponseBody
110	120	public List<Map<String,String>> qhdCZ(String startDate,String endDate){
111	121	if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){
112		- return qhdJbgwInterface.getChuZhen(startDate,endDate);
	122	+ return qhdJbgwInterface.getChuZhen(startDate, endDate);
	123	+ }
	124	+ return null;
	125	+ }
	126	+
	127	+
	128	+ @RequestMapping(value = "/qhd/fenmian")
	129	+ @ResponseBody
	130	+ public List<Map<String,String>> qhdFM(String startDate,String endDate){
	131	+ if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){
	132	+ return qhdJbgwInterface.getFm(startDate, endDate);
	133	+ }
	134	+ return null;
	135	+ }
	136	+
	137	+ @RequestMapping(value = "/qhd/xsefstest")
	138	+ @ResponseBody
	139	+ public List<Map<String,String>> qhdxinshengerFangShi(String startDate,String endDate){
	140	+ if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){
	141	+ return qhdJbgwInterface.getXsefs(startDate, endDate);
113	142	}
114	143	return null;
115	144	}

...	...	@@ -2,13 +2,11 @@
2	2
3	3	import com.lyms.platform.biz.service.*;
4	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
	5	+import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
5	6	import com.lyms.platform.common.enums.YnEnums;
6	7	import com.lyms.platform.common.result.BaseListResponse;
7	8	import com.lyms.platform.common.result.BaseResponse;
8		-import com.lyms.platform.common.utils.DateUtil;
9		-import com.lyms.platform.common.utils.ExcelUtil;
10		-import com.lyms.platform.common.utils.ExceptionUtils;
11		-import com.lyms.platform.common.utils.StringUtils;
	9	+import com.lyms.platform.common.utils.*;
12	10	import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
13	11	import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
14	12	import com.lyms.platform.operate.web.result.AntExManagerResult;
15	13
...	...	@@ -178,23 +176,23 @@
178	176	//区域范围内孕妇
179	177	if (isRegion) {
180	178	List<String> hospitalList = null;
181		- //王平说的必须要给区域医院权限，不然他就是蠢逼 201611124 16:41
182		- hospitalList = new ArrayList<>();
183		- String hospital = autoMatchFacade.getHospitalId(userId);
184		- if (null != hospital) {
185		- hospitalList.add(hospital);
	179	+ //王平说的必须要给区域医院权限，不然他就是蠢逼 201611124 16:41
	180	+ hospitalList = new ArrayList<>();
	181	+ String hospital = autoMatchFacade.getHospitalId(userId);
	182	+ if (null != hospital) {
	183	+ hospitalList.add(hospital);
	184	+ }
	185	+ DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
	186	+ dataPermissionsModelQuery.setUserId(userId);
	187	+ List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
	188	+ if (CollectionUtils.isNotEmpty(permissionsModels)) {
	189	+ Set<String> set = permissionsModels.get(0).getData().keySet();
	190	+ Iterator<String> it = set.iterator();
	191	+ while (it.hasNext()) {
	192	+ String id = it.next();
	193	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) {
	194	+ hospitalList.add(id);
186	195	}
187		- DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
188		- dataPermissionsModelQuery.setUserId(userId);
189		- List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
190		- if (CollectionUtils.isNotEmpty(permissionsModels)) {
191		- Set<String> set = permissionsModels.get(0).getData().keySet();
192		- Iterator<String> it = set.iterator();
193		- while (it.hasNext()) {
194		- String id = it.next();
195		- if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) {
196		- hospitalList.add(id);
197		- }
198	196	}
199	197	}
200	198
...	...	@@ -644,6 +642,8 @@
644	642
645	643	private List<AntExRecordModel> getIncrRiskAntexRecard(final Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,final AntExManagerQueryRequest request)
646	644	{
	645	+
	646	+ initBasicData();
647	647	List<String> ids = new ArrayList<>();
648	648	Map<String,List<String>> incriskMap = new HashMap<>();
649	649
...	...	@@ -681,7 +681,8 @@
681	681	if (CollectionUtils.isNotEmpty(list)) {
682	682	if (list.size() == 1) {
683	683	AntExRecordModel oneRecord = list.get(0);
684		- if (!(CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && oneRecord.gethRisk().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"))) {
	684	+ if (!(CollectionUtils.isNotEmpty(oneRecord.gethRisk()) &&
	685	+ oneRecord.gethRisk().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) && oneRecord.getType() == 2) {
685	686	if (CollectionUtils.isNotEmpty(oneRecord.gethRisk())) {
686	687	beforeRecordQuery.setParentId(patientId);
687	688	beforeRecordQuery.setCheckTimeEnd(oneRecord.getCheckTime());
...	...	@@ -766,7 +767,7 @@
766	767
767	768	for (Future f : listFuture) {
768	769	try {
769		- Map<String,Object> fmap = (Map) f.get(30, TimeUnit.SECONDS);
	770	+ Map<String,Object> fmap = (Map) f.get(30, TimeUnit.SECONDS);
770	771	if (fmap.get("ids") != null)
771	772	{
772	773	ids.addAll((List)fmap.get("ids"));
...	...	@@ -781,116 +782,7 @@
781	782	}
782	783	}
783	784	}
784		-
785		-
786		-
787		-// for (String patientId : map.keySet())
788		-// {
789		-// List<AntExRecordModel> list = map.get(patientId);
790		-// if (CollectionUtils.isNotEmpty(list))
791		-// {
792		-// if (list.size() == 1)
793		-// {
794		-// AntExRecordModel oneRecord = list.get(0);
795		-// if (!(CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && oneRecord.gethRisk().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")))
796		-// {
797		-// if (CollectionUtils.isNotEmpty(oneRecord.gethRisk()))
798		-// {
799		-// beforeRecordQuery.setParentId(patientId);
800		-// beforeRecordQuery.setCheckTimeEnd(oneRecord.getCheckTime());
801		-// beforeRecordQuery.setNeqId(oneRecord.getId());
802		-// List<AntExRecordModel> beforeAntRecords = recordService.queryAntExRecords(beforeRecordQuery);
803		-// if (CollectionUtils.isNotEmpty(beforeAntRecords))
804		-// {
805		-// AntExRecordModel twoRecord = beforeAntRecords.get(0);
806		-// List currentRiskList = oneRecord.gethRisk();
807		-// List beforeRiskList = twoRecord.gethRisk();
808		-//
809		-// if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")
810		-// && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel()))
811		-// {
812		-// ids.add(oneRecord.getId());
813		-// incriskMap.put(oneRecord.getId(), currentRiskList);
814		-// }
815		-// else if (CollectionUtils.isNotEmpty(beforeRiskList) )
816		-// {
817		-// List incrHrisk = new ArrayList();
818		-// for (Object riskId : currentRiskList)
819		-// {
820		-// if (!beforeRiskList.contains(riskId))
821		-// {
822		-// incrHrisk.add(riskId);
823		-// }
824		-// }
825		-// if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk,request.getLevel()))
826		-// {
827		-// ids.add(oneRecord.getId());
828		-// incriskMap.put(oneRecord.getId(), incrHrisk);
829		-// }
830		-// }
831		-// }
832		-// else
833		-// {
834		-// if (CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && getConditionRisk(request.getRiskFactorId(),
835		-// oneRecord.gethRisk(),request.getLevel()))
836		-// {
837		-// ids.add(oneRecord.getId());
838		-// incriskMap.put(oneRecord.getId(), oneRecord.gethRisk());
839		-// }
840		-// }
841		-// }
842		-// }
843		-// }
844		-// else if (list.size() > 1)
845		-// {
846		-// AntExRecordModel oneRecord = list.get(0);
847		-//
848		-// if (CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && oneRecord.gethRisk().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"))
849		-// {
850		-// continue;
851		-// }
852		-//
853		-// AntExRecordModel twoRecord = list.get(1);
854		-//
855		-// List currentRiskList = oneRecord.gethRisk();
856		-// List beforeRiskList = twoRecord.gethRisk();
857		-//
858		-// if (CollectionUtils.isEmpty(currentRiskList) && CollectionUtils.isEmpty(beforeRiskList))
859		-// {
860		-// continue;
861		-// }
862		-// if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")
863		-// && CollectionUtils.isEmpty(currentRiskList))
864		-// {
865		-// continue;
866		-// }
867		-//
868		-// if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")
869		-// && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel()))
870		-// {
871		-// ids.add(oneRecord.getId());
872		-// incriskMap.put(oneRecord.getId(), currentRiskList);
873		-// }
874		-// else if (CollectionUtils.isNotEmpty(beforeRiskList) )
875		-// {
876		-// List<String> incrHrisk = new ArrayList();
877		-// for (Object riskId : currentRiskList)
878		-// {
879		-// if (!beforeRiskList.contains(riskId))
880		-// {
881		-// incrHrisk.add(String.valueOf(riskId));
882		-// }
883		-// }
884		-// if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk,request.getLevel()))
885		-// {
886		-//
887		-// ids.add(oneRecord.getId());
888		-// incriskMap.put(oneRecord.getId(), incrHrisk);
889		-// }
890		-// }
891		-// }
892		-// }
893		-// }
	785	+ riskBasicMap.clear();
894	786	}
895	787
896	788	if (CollectionUtils.isEmpty(ids))
897	789
898	790
899	791
900	792
...	...	@@ -917,30 +809,52 @@
917	809	}
918	810
919	811
920		- private boolean isExistsLevel(String level,List<String> incrHrisk)
	812	+ private boolean isExistsLevel(String level,List<String> incrHrisks)
921	813	{
922	814	if (StringUtils.isNotEmpty(level))
923	815	{
924		- BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
925		- basicConfigQuery.setIds(incrHrisk);
926		- basicConfigQuery.setParentId(level);
927		- List<BasicConfig> configs = basicConfigService.queryBasicConfig(basicConfigQuery);
928		- if (CollectionUtils.isNotEmpty(configs))
	816	+ List<String> list = riskBasicMap.get(level);
	817	+ if (CollectionUtils.isNotEmpty(list))
929	818	{
930		- return true;
	819	+ return list.containsAll(incrHrisks);
931	820	}
932	821	return false;
933	822	}
934	823	return true;
935	824	}
936	825
	826	+ private Map<String,List<String>> riskBasicMap = new HashMap<>();
	827	+
	828	+ private void initBasicData()
	829	+ {
	830	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	831	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	832	+ basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID);
	833	+ List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
	834	+
	835	+ if (CollectionUtils.isNotEmpty(basicConfigs)) {
	836	+ for (BasicConfig basicConfig : basicConfigs) {
	837	+ List<String> ids = new ArrayList<>();
	838	+ basicConfigQuery.setParentId(basicConfig.getId());
	839	+ List<BasicConfig> basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery);
	840	+ if (CollectionUtils.isNotEmpty(basicConfigs2)) {
	841	+ for (BasicConfig bc : basicConfigs2) {
	842	+ ids.add(bc.getId());
	843	+ }
	844	+ }
	845	+ riskBasicMap.put(basicConfig.getId(),ids);
	846	+ }
	847	+ }
	848	+ }
	849	+
	850	+
937	851	private boolean getConditionRisk(String riskId,List<String> incrHrisk,String level)
938	852	{
939	853	if (StringUtils.isEmpty(riskId))
940	854	{
941	855	return isExistsLevel(level,incrHrisk);
942	856	}
943		- return incrHrisk.contains(riskId) && isExistsLevel(level,incrHrisk);
	857	+ return incrHrisk.contains(riskId) && isExistsLevel(level,incrHrisk);
944	858	}
945	859
946	860

...	...	@@ -70,7 +70,7 @@
70	70	<appender name="DAL-MONITOR" class="com.lyms.platform.common.log4j.DailyRollingFileAppender">
71	71	<param name="Append" value="true" />
72	72	<param name="File" value="${catalina.base}/logs/dal-perf.log" />
73		- <param name="bufferedIO" value="true" />
	73	+ <param name="bufferedIO" value="false" />
74	74	<!-- 50k为一个写单元，可以自己定义-->
75	75	<param name="bufferSize" value="8192" />
76	76	<layout class="org.apache.log4j.PatternLayout">