jiangjiazhi / regional-platform

Commit fbbcc35440cd915756eef4ccb7445e36d94c48c3

Authored by baohanddd almost 9 years ago

Exists in master and in 8 other branches

add risk enum color

Showing 11 changed files with 654 additions and 20 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
platform-biz-service/src/main/resources/mainOrm/Users.xml
platform-common/src/main/java/com/lyms/platform/common/enums/RiskDefaultTypeEnum.java
platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
platform-data-api/src/main/java/com/lyms/platform/data/pojo/ExtPatients.java
platform-data-api/src/main/java/com/lyms/platform/data/service/DataImportTaskService.java
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/model/RiskColorEnum.java
platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/model/RiskDetails.java
platform-mommyData/src/main/resources/earlyOrm/Plat.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java

...	...	@@ -24,6 +24,15 @@
24	24	private Date lastLoginTime;
25	25	private Integer zhiChenId;
26	26	private String zhiChen;
	27	+ private String employeeId;
	28	+
	29	+ public String getEmployeeId() {
	30	+ return employeeId;
	31	+ }
	32	+
	33	+ public void setEmployeeId(String employeeId) {
	34	+ this.employeeId = employeeId;
	35	+ }
27	36
28	37	public String getZhiChen() {
29	38	return zhiChen;

...	...	@@ -22,6 +22,7 @@
22	22	<result column="remarks" property="remarks" jdbcType="VARCHAR"/>
23	23	<result column="last_login_time" property="lastLoginTime" jdbcType="TIMESTAMP"/>
24	24	<result column="foreign_id" property="foreignId" jdbcType="VARCHAR"/>
	25	+ <result column="employee_id" property="employeeId" jdbcType="VARCHAR"/>
25	26	<result column="other_account" property="otherAccount" jdbcType="INTEGER"/>
26	27	<result column="zhiChenId" property="zhiChenId" jdbcType="INTEGER"/>
27	28	</resultMap>

1	1	package com.lyms.platform.common.enums;
2	2
	3	+import org.apache.commons.lang.StringUtils;
	4	+
3	5	/**
4	6	* Created by Administrator on 2016/6/22 0022.
5	7	*/
...	...	@@ -13,6 +15,18 @@
13	15	private RiskDefaultTypeEnum(String title, String color) {
14	16	this.color = color;
15	17	this.title = title;
	18	+ }
	19	+
	20	+ public static String getColor(String title) {
	21	+ if (StringUtils.isBlank(title)) {
	22	+ return "";
	23	+ }
	24	+ for (RiskDefaultTypeEnum e:RiskDefaultTypeEnum.values()) {
	25	+ if (title.startsWith(e.getTitle())) {
	26	+ return e.getColor();
	27	+ }
	28	+ }
	29	+ return "green";
16	30	}
17	31
18	32	private String title;

...	...	@@ -35,6 +35,15 @@
35	35
36	36	private Integer score;
37	37	private String describe;
	38	+ private String color;
	39	+
	40	+ public String getColor() {
	41	+ return color;
	42	+ }
	43	+
	44	+ public void setColor(String color) {
	45	+ this.color = color;
	46	+ }
38	47
39	48	public Integer getScore() {
40	49	return score;

	1	+package com.lyms.platform.data.pojo;
	2	+
	3	+import com.lyms.platform.pojo.AntenatalExaminationModel;
	4	+import com.lyms.platform.pojo.Patients;
	5	+import com.lymsh.mommybaby.earlydata.model.RiskDetails;
	6	+
	7	+import java.util.List;
	8	+
	9	+/**
	10	+ * Created by Administrator on 2016/8/11 0011.
	11	+ */
	12	+public class ExtPatients extends Patients {
	13	+
	14	+ private List<AntenatalExaminationModel> reportsList;
	15	+ private List<RiskDetails> riskDetailsList;
	16	+ private List<Integer> doctorUserIdList;
	17	+
	18	+ public List<Integer> getDoctorUserIdList() {
	19	+ return doctorUserIdList;
	20	+ }
	21	+
	22	+ public void setDoctorUserIdList(List<Integer> doctorUserIdList) {
	23	+ this.doctorUserIdList = doctorUserIdList;
	24	+ }
	25	+
	26	+ public List<AntenatalExaminationModel> getReportsList() {
	27	+ return reportsList;
	28	+ }
	29	+
	30	+ public void setReportsList(List<AntenatalExaminationModel> reportsList) {
	31	+ this.reportsList = reportsList;
	32	+ }
	33	+
	34	+ public List<RiskDetails> getRiskDetailsList() {
	35	+ return riskDetailsList;
	36	+ }
	37	+
	38	+ public void setRiskDetailsList(List<RiskDetails> riskDetailsList) {
	39	+ this.riskDetailsList = riskDetailsList;
	40	+ }
	41	+}

...	...	@@ -43,19 +43,35 @@
43	43	public void updateAssayByHospital(String hospitalForeignId, Integer hospitalId, Date startTime);
44	44
45	45	/**
46		- * 增量同步检产妇
	46	+ * 增量同步产妇
47	47	*/
48		- public void updatePatients();
	48	+ public void updatePuerpera();
49	49
50	50	/**
51	51	* 全量同步产妇
52	52	*/
53		- public void fullUpdatePatients();
	53	+ public void fullUpdatePuerpera();
54	54
55	55	/**
56	56	* 按医院同步产妇
57	57	*/
58		- public void updatePatientsByHospital(String hospitalForeignId, Integer hospitalId, Date startTime);
	58	+ public void updatePuerperaByHospital(String hospitalForeignId, Integer hospitalId, Date startTime);
	59	+
	60	+ /**
	61	+ * 增量同步孕妇
	62	+ */
	63	+ public void updateGravida();
	64	+
	65	+ /**
	66	+ * 全量同步孕妇
	67	+ */
	68	+ public void fullUpdateGravida();
	69	+
	70	+ /**
	71	+ * 按医院同步孕妇
	72	+ */
	73	+ public void updateGravidaByHospital(String hospitalForeignId, Integer hospitalId, Date startTime);
	74	+
59	75
60	76	/**
61	77	* 增量同步新生儿

...	...	@@ -6,17 +6,20 @@
6	6	import com.lyms.platform.common.enums.UserTypeEnum;
7	7	import com.lyms.platform.common.enums.VisitStatusEnums;
8	8	import com.lyms.platform.common.enums.YnEnums;
	9	+import com.lyms.platform.common.utils.DateUtil;
	10	+import com.lyms.platform.common.utils.JsonUtil;
9	11	import com.lyms.platform.common.utils.LogUtil;
10	12	import com.lyms.platform.common.utils.LoginUtil;
	13	+import com.lyms.platform.data.pojo.ExtPatients;
11	14	import com.lyms.platform.data.service.DataImportTaskService;
12	15	import com.lyms.platform.permission.model.*;
13	16	import com.lyms.platform.permission.service.*;
14	17	import com.lyms.platform.pojo.*;
15	18	import com.lyms.platform.query.BabyModelQuery;
16	19	import com.lyms.platform.query.PatientsQuery;
	20	+import com.lymsh.mommybaby.earlydata.dao.MommyMapper;
17	21	import com.lymsh.mommybaby.earlydata.dao.PlatMapper;
18		-import com.lymsh.mommybaby.earlydata.model.PlatDataContent;
19		-import com.lymsh.mommybaby.earlydata.model.PlatDataType;
	22	+import com.lymsh.mommybaby.earlydata.model.*;
20	23	import org.apache.commons.collections.CollectionUtils;
21	24	import org.apache.commons.lang.StringUtils;
22	25	import org.apache.commons.lang.math.NumberUtils;
23	26
...	...	@@ -60,7 +63,11 @@
60	63
61	64	@Autowired
62	65	private PlatMapper platMapper;
	66	+
63	67	@Autowired
	68	+ private MommyMapper mommyMapper;
	69	+
	70	+ @Autowired
64	71	private CommunityConfigService communityConfigService;
65	72
66	73	@Autowired
...	...	@@ -292,6 +299,7 @@
292	299	if (StringUtils.isBlank(users.getForeignId()) \|\| !map.get("U_ID").toString().equals(users.getForeignId())) {
293	300	users = new Users();
294	301	users.setForeignId(map.get("U_ID").toString());
	302	+ users.setEmployeeId(map.get("E_ID").toString());
295	303	departments.getUsersMap().put(users.getForeignId(), users);
296	304	users.setPublishId(0);
297	305	users.setPublishName("system");
298	306
299	307
...	...	@@ -427,17 +435,17 @@
427	435
428	436
429	437	/**
430		- * 每5分钟同步一次（早六点到晚九点）
	438	+ * 每17分钟同步一次（早六点到晚九点）
431	439	*/
432	440	@Override
433		- public void updatePatients() {
	441	+ public void updatePuerpera() {
434	442	Date startTime = new DateTime().minusMinutes(10).toDate();
435	443	OrganizationQuery query = new OrganizationQuery();
436	444	query.setYn(YnEnums.YES.getId());
437	445	List<Organization> list = organizationService.queryOrganization(query);
438	446	for (Organization organization : list) {
439	447	if (StringUtils.isNotBlank(organization.getForeignId())) {
440		- updatePatientsByHospital(organization.getForeignId(), organization.getId(), null);
	448	+ updatePuerperaByHospital(organization.getForeignId(), organization.getId(), null);
441	449	}
442	450	}
443	451	}
444	452
...	...	@@ -446,12 +454,12 @@
446	454	* 每天晚上9点55同步一次
447	455	*/
448	456	@Override
449		- public void fullUpdatePatients() {
450		- updatePatientsByHospital(null, null, null);
	457	+ public void fullUpdatePuerpera() {
	458	+ updatePuerperaByHospital(null, null, null);
451	459	}
452	460
453	461	@Override
454		- public void updatePatientsByHospital(String hospitalForeignId, Integer hospitalId, Date startTime) {
	462	+ public void updatePuerperaByHospital(String hospitalForeignId, Integer hospitalId, Date startTime) {
455	463	try {
456	464	List<String> pidList = new ArrayList<>();
457	465	List<Map> list = platMapper.selectAllPuerperaByHospitalId(hospitalForeignId, startTime);
...	...	@@ -684,7 +692,7 @@
684	692	}
685	693
686	694	/**
687		- * 每5分钟同步一次（早六点到晚九点）
	695	+ * 每13分钟同步一次（早六点到晚九点）
688	696	*/
689	697	@Override
690	698	public void updateNewBorns() {
...	...	@@ -710,6 +718,400 @@
710	718	@Override
711	719	public void updateNewBornsByHospital(String hospitalForeignId, Integer hospitalId, Date startTime) {
712	720
	721	+ }
	722	+
	723	+ /**
	724	+ * 每9分钟同步一次，（早六点到晚九点）
	725	+ */
	726	+ @Override
	727	+ public void updateGravida() {
	728	+ Date startTime = new DateTime().minusMinutes(10).toDate();
	729	+ OrganizationQuery query = new OrganizationQuery();
	730	+ query.setYn(YnEnums.YES.getId());
	731	+ List<Organization> list = organizationService.queryOrganization(query);
	732	+ for (Organization organization : list) {
	733	+ if (StringUtils.isNotBlank(organization.getForeignId())) {
	734	+ updateGravidaByHospital(organization.getForeignId(), organization.getId(), null);
	735	+ }
	736	+ }
	737	+ }
	738	+
	739	+ @Override
	740	+ public void fullUpdateGravida() {
	741	+ updateGravidaByHospital(null, null, null);
	742	+ }
	743	+
	744	+ private Map<String, String> selectDcIdNameMap(String tableName) {
	745	+ OracleCommonQuery query = new OracleCommonQuery(null, null, null);
	746	+ query.setTableName(tableName);
	747	+ List<PlatDataContent> list = mommyMapper.selectDcIdName(query);
	748	+ Map<String, String> map = new HashMap<>();
	749	+ for (PlatDataContent dc:list) {
	750	+ if (StringUtils.isNotBlank(dc.getDcId()) && StringUtils.isNotBlank(dc.getDcName())) {
	751	+ map.put(dc.getDcId(), dc.getDcName());
	752	+ }
	753	+ }
	754	+ return map;
	755	+ }
	756	+
	757	+ @Override
	758	+ public void updateGravidaByHospital(String hospitalForeignId, Integer hospitalId, Date startTime) {
	759	+// try {
	760	+// List<Map> list = platMapper.selectAllByHospitalId(hospitalForeignId, startTime);
	761	+// if (list != null && list.size() > 0) {
	762	+// List<PlatDataContent> guideList = mommyMapper.selectGuideTheWomen(null);
	763	+// Map<Integer, StringBuffer> guideMap = new HashMap<>();
	764	+// for (PlatDataContent guide : guideList) {
	765	+// if (StringUtils.isNotBlank(guide.getDcId()) && StringUtils.isNotBlank(guide.getDcName()) && guide.getWeek() != null) {
	766	+// if (guideMap.get(guide.getWeek()) == null) {
	767	+// guideMap.put(guide.getWeek(), new StringBuffer());
	768	+// }
	769	+// guideMap.get(guide.getWeek()).append(guide.getDcId() + ":" + guide.getDcName());
	770	+// guideMap.get(guide.getWeek()).append("\n");
	771	+// }
	772	+// }
	773	+//// Map<String, HighRiskFactors> factorsMap = highRiskFactorsService.queryIdMap();
	774	+//
	775	+// Map<String, List<Integer>> doctorIdMap = new HashMap<>();
	776	+// UsersQuery usersQuery = new UsersQuery();
	777	+// usersQuery.setOrgId(hospitalId);
	778	+// List<Users> doctorUsersList1 = usersService.queryUsers(usersQuery);
	779	+// for (Users doctorUsers : doctorUsersList1) {
	780	+// if (StringUtils.isNotBlank(doctorUsers.getEmployeeId())) {
	781	+// if (doctorIdMap.get(doctorUsers.getEmployeeId()) == null) {
	782	+// doctorIdMap.put(doctorUsers.getEmployeeId(), new ArrayList<Integer>());
	783	+// }
	784	+// doctorIdMap.get(doctorUsers.getEmployeeId()).add(doctorUsers.getId());
	785	+// }
	786	+// }
	787	+//
	788	+// // 衔接 v_link
	789	+// Map<String, String> vlinkMap = selectDcIdNameMap("v_link");
	790	+// // 胎方位 V_FOETUSPOSITION
	791	+// Map<String, String> vfoetusPositionMap = selectDcIdNameMap("V_FOETUSPOSITION");
	792	+// // 胎先露 V_LEAK
	793	+// Map<String, String> vleakMap = selectDcIdNameMap("V_LEAK");
	794	+//
	795	+// Map<String, RiskDetails> riskDetailsMap = new HashMap<>();
	796	+// Map<String, AntenatalExaminationModel> reportsMap = new HashMap<>();
	797	+// List<Integer> factorIdList = new ArrayList<>();
	798	+// List<Integer> groupIdList = new ArrayList<>();
	799	+// List<Integer> doctorUserIdList = new ArrayList<>();
	800	+// ExtPatients cpatients = new ExtPatients();
	801	+// for (Map map : list) {
	802	+// try {
	803	+// if (map.get("P_NAME") == null \|\| map.get("P_MOBILEPHONE") == null \|\| map.get("P_ID") == null) {
	804	+// continue;
	805	+// }
	806	+// if (StringUtils.isBlank(cpatients.getForeignId()) \|\| !map.get("P_ID").toString().equals(cpatients.getForeignId())) {
	807	+// if (riskDetailsMap.size() > 0) {
	808	+// List<RiskDetails> riskDetailsList = new ArrayList<>();
	809	+// riskDetailsList.addAll(riskDetailsMap.values());
	810	+// cpatients.setRiskDetailsList(riskDetailsList);
	811	+// }
	812	+// if (reportsMap.size() > 0) {
	813	+// List<AntenatalExaminationModel> reportsList = new ArrayList<>();
	814	+// reportsList.addAll(reportsMap.values());
	815	+// cpatients.setReportsList(reportsList);
	816	+// }
	817	+// cpatients.setDoctorUserIdList(doctorUserIdList);
	818	+// StringBuilder factorIdStr = new StringBuilder(",");
	819	+// StringBuilder groupIdStr = new StringBuilder(",");
	820	+// for (Integer i : factorIdList) {
	821	+// factorIdStr.append(i).append(",");
	822	+// }
	823	+// for (Integer i : groupIdList) {
	824	+// groupIdStr.append(i).append(",");
	825	+// }
	826	+// cpatients.setRiskFactorId(factorIdList);
	827	+// cpatients.setRiskGroupId(groupIdStr.toString());
	828	+// savePatient(cpatients);
	829	+//
	830	+// // init new patient
	831	+// doctorUserIdList = new ArrayList<>();
	832	+// riskDetailsMap = new HashMap<>();
	833	+// reportsMap = new HashMap<>();
	834	+// factorIdList = new ArrayList<>();
	835	+// groupIdList = new ArrayList<>();
	836	+// cpatients = new ExtPatients();
	837	+//
	838	+// cpatients.setHospitalForeignId(map.get("P_HOSPITALID").toString());
	839	+// cpatients.setForeignId(map.get("P_ID").toString());
	840	+// cpatients.setUsername(map.get("P_NAME").toString());
	841	+// cpatients.setPhone(map.get("P_MOBILEPHONE").toString());
	842	+// cpatients.setBirth((Date) map.get("P_BIRTHDAY"));
	843	+// Object osex = map.get("P_SEX");
	844	+// if (osex != null && osex.equals(0)) {
	845	+// cpatients.setGender(2);
	846	+// } else {
	847	+// cpatients.setGender(1);
	848	+// }
	849	+// cpatients.setPublishId(0);
	850	+// cpatients.setPublishName("system");
	851	+// Object oisvalid = map.get("P_ISVALID");
	852	+// if (oisvalid == null) {
	853	+// cpatients.setYn(YnEnum.no.getId());
	854	+// } else {
	855	+// try {
	856	+// if (Integer.valueOf(oisvalid.toString()) == 1) {
	857	+// cpatients.setYn(YnEnum.yes.getId());
	858	+// } else {
	859	+// cpatients.setYn(YnEnum.no.getId());
	860	+// }
	861	+// } catch (Exception e) {
	862	+// cpatients.setYn(YnEnum.no.getId());
	863	+// }
	864	+// }
	865	+// cpatients.setForeignSubId(map.get("P_NO").toString());
	866	+// cpatients.setType(1); // 孕妇
	867	+// cpatients.setLastMenses((Date) map.get("P_LASTMENSTRUALPERIOD"));
	868	+// BigDecimal vip = (BigDecimal) map.get("P_ISVIP");
	869	+// cpatients.setVip(vip == null ? null : vip.intValue());
	870	+// BigDecimal servicetype = (BigDecimal) map.get("P_SERVICETYPE");
	871	+// cpatients.setServiceType(servicetype == null ? null : servicetype.intValue());
	872	+// if (cpatients.getLastMenses() != null) {
	873	+// DateTime dt = new DateTime(cpatients.getLastMenses());
	874	+// dt = dt.plusMonths(9);
	875	+// dt = dt.plusDays(7);
	876	+// cpatients.setDueDate(dt.toDate());
	877	+// }
	878	+// // 如果末次月经为空，视为脏数据，设置为删除状态
	879	+// if (cpatients.getLastMenses() == null) {
	880	+// cpatients.setYn(YnEnum.no.getId());
	881	+// }
	882	+//
	883	+// if (map.get("P_OPERUSER") != null) {
	884	+// List<Integer> tempIdList = doctorIdMap.get(map.get("P_OPERUSER").toString());
	885	+// if (tempIdList != null && tempIdList.size() > 0) {
	886	+// for (Integer id : tempIdList) {
	887	+// if (!doctorUserIdList.contains(id)) {
	888	+// doctorUserIdList.add(id);
	889	+// }
	890	+// }
	891	+// }
	892	+// }
	893	+// if (map.get("P_FILINGOPER") != null) {
	894	+// List<Integer> tempIdList = doctorIdMap.get(map.get("P_FILINGOPER").toString());
	895	+// if (tempIdList != null && tempIdList.size() > 0) {
	896	+// for (Integer id : tempIdList) {
	897	+// if (!doctorUserIdList.contains(id)) {
	898	+// doctorUserIdList.add(id);
	899	+// }
	900	+// }
	901	+// }
	902	+// }
	903	+//
	904	+// if ("已分娩".equals(map.get("PI_AGEMONTH"))) {
	905	+// cpatients.setType(3); // 已分娩
	906	+// }
	907	+//
	908	+// Object vcolorname = map.get("V_ME_COLORNAME");
	909	+// if (vcolorname != null) {
	910	+// String[] colors = vcolorname.toString().split(",");
	911	+// Integer crisis = 0;
	912	+// for (String color : colors) {
	913	+// crisis = crisis \| RiskColorEnum.getId(color);
	914	+// }
	915	+// Risks risks = new Risks();
	916	+// risks.setCrisis(crisis);
	917	+// risks.setReason((String) map.get("V_DC_NAME"));
	918	+// risks.setTitle(risks.getReason());
	919	+// risks.setYn(YnEnum.yes.getId());
	920	+// risks.setPublishId(0);
	921	+// risks.setPublishName("system");
	922	+// cpatients.setRisks(risks);
	923	+//
	924	+// Warnings warnings = new Warnings();
	925	+// warnings.setYn(YnEnum.yes.getId());
	926	+// BigDecimal fenshu = (BigDecimal) map.get("V_FENSHU");
	927	+// warnings.setScore(fenshu == null ? null : fenshu.intValue());
	928	+// warnings.setPublishId(0);
	929	+// warnings.setPublishName("system");
	930	+// warnings.setLevel(crisis);
	931	+// warnings.setFactor(risks.getTitle());
	932	+// if (cpatients.getLastMenses() != null) {
	933	+// StringBuffer sb = guideMap.get(DateUtil.getWeek(cpatients.getLastMenses()));
	934	+// warnings.setGuide(sb == null ? null : sb.toString());
	935	+// }
	936	+// cpatients.setWarnings(warnings);
	937	+// }
	938	+//
	939	+// }
	940	+//
	941	+// // risk detail
	942	+// if (map.get("ME_COLORNAME") != null && map.get("DC_NAME") != null && !"健康".equals(map.get("DC_NAME"))) {
	943	+// if (riskDetailsMap.get(map.get("DC_NAME").toString()) == null && cpatients.getRisks() != null
	944	+// && cpatients.getRisks().getTitle() != null && cpatients.getRisks().getTitle().contains(map.get("DC_NAME").toString())) {
	945	+// RiskDetails details = new RiskDetails();
	946	+// details.setYn(YnEnum.yes.getId());
	947	+// details.setPublishId(0);
	948	+// details.setPublishName("system");
	949	+// details.setTitle(map.get("DC_NAME").toString());
	950	+// details.setScore(map.get("DC_NO") == null ? null : Integer.valueOf(map.get("DC_NO").toString()));
	951	+// details.setCrisis(RiskColorEnum.getId(map.get("ME_COLORNAME").toString()));
	952	+// riskDetailsMap.put(details.getTitle(), details);
	953	+// HighRiskFactors factors = factorsMap.get(details.getTitle());
	954	+// if (factors != null) {
	955	+// factorIdList.add(factors.getId());
	956	+// groupIdList.add(factors.getGroupId());
	957	+// }
	958	+// }
	959	+// }
	960	+//
	961	+//
	962	+// // report
	963	+// if (!reportsMap.containsKey(map.get("fe_id"))) {
	964	+// MommyMultiMap mmm = buildReportTable(map, "MOMMY_FIRSTEXAMINE");
	965	+// List<KVObject> contentList = new ArrayList<KVObject>();
	966	+// for (String name : mmm.getFilterMap().keySet()) {
	967	+// String v = mmm.getFilterMap().get(name);
	968	+// if (name.startsWith("衔接")) {
	969	+// v = vlinkMap.get(v);
	970	+// } else if (name.startsWith("胎方位")) {
	971	+// v = vfoetusPositionMap.get(v);
	972	+// } else if (name.startsWith("胎先露")) {
	973	+// v = vleakMap.get(v);
	974	+// }
	975	+// KVObject kv = new KVObject(name, v);
	976	+// contentList.add(kv);
	977	+// }
	978	+// Reports report = new Reports();
	979	+// report.setType(1);
	980	+// report.setCheckType(CheckTypeEnum.chanjian.getId());
	981	+// report.setPhysicalTime((Date) mmm.getRealMap().get("FE_MEDICALDATA"));
	982	+// Hospitals hospitals = hospitalsService.getHospitals(mmm.getFullMap().get("fe_hospitalid"));
	983	+// if (hospitals != null) {
	984	+// report.setHospitalName(hospitals.getTitle());
	985	+// }
	986	+// report.setRealName(cpatients.getUsername());
	987	+// report.setResult(JsonUtil.array2JsonString(contentList));
	988	+// report.setForeignId(mmm.getFullMap().get("fe_id"));
	989	+// report.setPublishId(0);
	990	+// report.setPublishName("system");
	991	+// report.setYn(YnEnum.yes.getId());
	992	+// report.setAge(cpatients.getAge());
	993	+// report.setWeeks(DateUtil.getWeek(cpatients.getLastMenses(), report.getPhysicalTime()));
	994	+// report.setEmployeeId(mmm.getFullMap().get("fe_doctor"));
	995	+// if (StringUtils.isNotBlank(report.getEmployeeId()) && doctorIdMap.containsKey(report.getEmployeeId())) {
	996	+// List<Integer> tempIdList = doctorIdMap.get(report.getEmployeeId());
	997	+// if (tempIdList != null && tempIdList.size() > 0) {
	998	+// for (Integer id : tempIdList) {
	999	+// if (!doctorUserIdList.contains(id)) {
	1000	+// doctorUserIdList.add(id);
	1001	+// }
	1002	+// }
	1003	+// }
	1004	+// }
	1005	+// MmbbDoctorUsers mdu = getMmbbDoctorUsers(mmm.getFullMap().get("fe_doctor"));
	1006	+// if (mdu != null) {
	1007	+// report.setPublishName(mdu.getEName());
	1008	+// report.setHospitalName(mdu.getEHospitalname());
	1009	+// report.setDoctorName(mdu.getEName());
	1010	+// }
	1011	+// report.setNextCheckTime(mmm.getRealMap().get("FE_ORDERNEXT") == null ? null : (Date) mmm.getRealMap().get("FE_ORDERNEXT"));
	1012	+// report.setUh(mmm.getFullMap().get("fe_uterusheight"));
	1013	+// report.setW(mmm.getFullMap().get("fe_weight"));
	1014	+// report.setAp(mmm.getFullMap().get("fe_abgirth"));
	1015	+// reportsMap.put(report.getForeignId(), report);
	1016	+// }
	1017	+// if (!reportsMap.containsKey(map.get("er_id"))) {
	1018	+// MommyMultiMap mmm = buildReportTable(map, "MOMMY_EXAMINERESULT");
	1019	+// List<KVObject> contentList = new ArrayList<KVObject>();
	1020	+// for (String name : mmm.getFilterMap().keySet()) {
	1021	+// String v = mmm.getFilterMap().get(name);
	1022	+// if (name.startsWith("衔接")) {
	1023	+// v = vlinkMap.get(v);
	1024	+// } else if (name.startsWith("胎方位")) {
	1025	+// v = vfoetusPositionMap.get(v);
	1026	+// } else if (name.startsWith("胎先露")) {
	1027	+// v = vleakMap.get(v);
	1028	+// }
	1029	+// KVObject kv = new KVObject(name, v);
	1030	+// contentList.add(kv);
	1031	+// }
	1032	+// Reports report = new Reports();
	1033	+// report.setPatientId(cpatients.getId());
	1034	+// report.setType(1);
	1035	+// report.setCheckType(CheckTypeEnum.chanjian.getId());
	1036	+// report.setPhysicalTime((Date) mmm.getRealMap().get("ER_CHECKDATE"));
	1037	+// report.setRealName(cpatients.getUsername());
	1038	+// report.setResult(JsonUtil.array2JsonString(contentList));
	1039	+// report.setForeignId(mmm.getFullMap().get("er_id"));
	1040	+// report.setPublishId(0);
	1041	+// report.setPublishName("system");
	1042	+// report.setYn(YnEnum.yes.getId());
	1043	+// report.setAge(cpatients.getAge());
	1044	+// report.setWeeks(DateUtil.getWeek(cpatients.getLastMenses(), report.getPhysicalTime()));
	1045	+// report.setEmployeeId(mmm.getFullMap().get("er_creator"));
	1046	+// if (StringUtils.isNotBlank(report.getEmployeeId()) && doctorIdMap.containsKey(report.getEmployeeId())) {
	1047	+// List<Integer> tempIdList = doctorIdMap.get(report.getEmployeeId());
	1048	+// if (tempIdList != null && tempIdList.size() > 0) {
	1049	+// for (Integer id : tempIdList) {
	1050	+// if (!doctorUserIdList.contains(id)) {
	1051	+// doctorUserIdList.add(id);
	1052	+// }
	1053	+// }
	1054	+// }
	1055	+// }
	1056	+// MmbbDoctorUsers mdu = getMmbbDoctorUsers(mmm.getFullMap().get("er_creator"));
	1057	+// if (mdu != null) {
	1058	+// report.setPublishName(mdu.getEName());
	1059	+// report.setHospitalName(mdu.getEHospitalname());
	1060	+// report.setDoctorName(mdu.getEName());
	1061	+// }
	1062	+// report.setNextCheckTime(mmm.getRealMap().get("ER_NEXTDATE") == null ? null : (Date) mmm.getRealMap().get("ER_NEXTDATE"));
	1063	+// report.setUh(mmm.getFullMap().get("er_uterusheight"));
	1064	+// report.setW(mmm.getFullMap().get("er_weight"));
	1065	+// report.setAp(mmm.getFullMap().get("er_circumference"));
	1066	+// reportsMap.put(report.getForeignId(), report);
	1067	+// }
	1068	+//
	1069	+//
	1070	+// } catch (Exception ee) {
	1071	+// ee.printStackTrace();
	1072	+// LogUtil.taskError(JsonUtil.obj2JsonString(map) + " -- " + JsonUtil.obj2JsonString(cpatients), ee);
	1073	+//
	1074	+// // init new patient
	1075	+// doctorUserIdList = new ArrayList<>();
	1076	+// riskDetailsMap = new HashMap<>();
	1077	+// reportsMap = new HashMap<>();
	1078	+// factorIdList = new HashSet<>();
	1079	+// groupIdList = new HashSet<>();
	1080	+// cpatients = new ExtPatients();
	1081	+// }
	1082	+// }
	1083	+// if (StringUtils.isNotBlank(cpatients.getForeignId())) {
	1084	+// if (riskDetailsMap.size() > 0) {
	1085	+// List<RiskDetails> riskDetailsList = new ArrayList<>();
	1086	+// riskDetailsList.addAll(riskDetailsMap.values());
	1087	+// cpatients.setRiskDetailsList(riskDetailsList);
	1088	+// }
	1089	+// if (reportsMap.size() > 0) {
	1090	+// List<Reports> reportsList = new ArrayList<>();
	1091	+// reportsList.addAll(reportsMap.values());
	1092	+// cpatients.setReportsList(reportsList);
	1093	+// }
	1094	+// cpatients.setDoctorUserIdList(doctorUserIdList);
	1095	+// StringBuilder factorIdStr = new StringBuilder(",");
	1096	+// StringBuilder groupIdStr = new StringBuilder(",");
	1097	+// for (Integer i : factorIdList) {
	1098	+// factorIdStr.append(i).append(",");
	1099	+// }
	1100	+// for (Integer i : groupIdList) {
	1101	+// groupIdStr.append(i).append(",");
	1102	+// }
	1103	+// cpatients.setRiskFactorId(factorIdStr.toString());
	1104	+// cpatients.setRiskGroupId(groupIdStr.toString());
	1105	+// savePatient(cpatients);
	1106	+// }
	1107	+// } else {
	1108	+// LogUtil.taskInfo("hospitalId:"+hospitalForeignId+" has no data!");
	1109	+// }
	1110	+// } catch (Exception e) {
	1111	+// e.printStackTrace();
	1112	+// LogUtil.taskError(e.getMessage(), e);
	1113	+// }
	1114	+//
713	1115	}
714	1116	}

1	1	package com.lymsh.mommybaby.earlydata.model;
2	2
	3	+import org.apache.commons.lang.StringUtils;
	4	+
3	5	/**
4	6	* Created by riecard on 15/11/13.
5	7	* 橙,黄,红,紫,绿
6	8
7	9
...	...	@@ -7,16 +9,17 @@
7	9	*/
8	10	public enum RiskColorEnum {
9	11
10		- Orange(1,"Orange"),
11		- Yellow(2,"Yellow"),
12		- Red(4,"Red"),
13		- Purple(8,"Purple"),
14		- Green(16,"Green")
	12	+ Orange(1,"Orange", "橙色"),
	13	+ Yellow(2,"Yellow", "黄色"),
	14	+ Red(4,"Red", "红色"),
	15	+ Purple(8,"Purple", "紫色"),
	16	+ Green(16,"Green", "绿色")
15	17	;
16	18
17		- private RiskColorEnum(Integer id, String title) {
	19	+ private RiskColorEnum(Integer id, String title, String color) {
18	20	this.id = id;
19	21	this.title = title;
	22	+ this.color = color;
20	23	}
21	24
22	25	public static String getTitle(Integer id) {
...	...	@@ -28,6 +31,18 @@
28	31	return "";
29	32	}
30	33
	34	+ public static String getTitle(String color) {
	35	+ if (StringUtils.isBlank(color)) {
	36	+ return null;
	37	+ }
	38	+ for (RiskColorEnum e: RiskColorEnum.values()) {
	39	+ if (color.startsWith(e.getColor())) {
	40	+ return e.getTitle();
	41	+ }
	42	+ }
	43	+ return null;
	44	+ }
	45	+
31	46	public static Integer getLevel(Integer total) {
32	47	if (total == null) {
33	48	return 0;
...	...	@@ -65,6 +80,15 @@
65	80	}
66	81	private Integer id;
67	82	private String title;
	83	+ private String color;
	84	+
	85	+ public String getColor() {
	86	+ return color;
	87	+ }
	88	+
	89	+ public void setColor(String color) {
	90	+ this.color = color;
	91	+ }
68	92
69	93	public Integer getId() {
70	94	return id;

	1	+package com.lymsh.mommybaby.earlydata.model;
	2	+
	3	+import java.util.Date;
	4	+
	5	+public class RiskDetails {
	6	+ private Integer patientId;
	7	+ private String title;
	8	+ private String reason;
	9	+ private Integer crisis;
	10	+ private Integer publishId;
	11	+ private String publishName;
	12	+ private Integer yn;
	13	+ private Date modified;
	14	+ private Date created;
	15	+ private Integer score;
	16	+
	17	+ public Integer getScore() {
	18	+ return score;
	19	+ }
	20	+
	21	+ public void setScore(Integer score) {
	22	+ this.score = score;
	23	+ }
	24	+
	25	+ public Integer getPatientId() {
	26	+ return patientId;
	27	+ }
	28	+
	29	+
	30	+ public void setPatientId(Integer patientId) {
	31	+ this.patientId = patientId;
	32	+
	33	+ }
	34	+
	35	+ public String getTitle() {
	36	+ return title;
	37	+ }
	38	+
	39	+
	40	+ public void setTitle(String title) {
	41	+ this.title = title;
	42	+
	43	+ }
	44	+
	45	+ public String getReason() {
	46	+ return reason;
	47	+ }
	48	+
	49	+
	50	+ public void setReason(String reason) {
	51	+ this.reason = reason;
	52	+
	53	+ }
	54	+
	55	+ public Integer getCrisis() {
	56	+ return crisis;
	57	+ }
	58	+
	59	+
	60	+ public void setCrisis(Integer crisis) {
	61	+ this.crisis = crisis;
	62	+
	63	+ }
	64	+
	65	+ public Integer getPublishId() {
	66	+ return publishId;
	67	+ }
	68	+
	69	+
	70	+ public void setPublishId(Integer publishId) {
	71	+ this.publishId = publishId;
	72	+
	73	+ }
	74	+
	75	+ public String getPublishName() {
	76	+ return publishName;
	77	+ }
	78	+
	79	+
	80	+ public void setPublishName(String publishName) {
	81	+ this.publishName = publishName;
	82	+
	83	+ }
	84	+
	85	+ public Integer getYn() {
	86	+ return yn;
	87	+ }
	88	+
	89	+
	90	+ public void setYn(Integer yn) {
	91	+ this.yn = yn;
	92	+
	93	+ }
	94	+
	95	+ public Date getModified() {
	96	+ return modified;
	97	+ }
	98	+
	99	+
	100	+ public void setModified(Date modified) {
	101	+ this.modified = modified;
	102	+
	103	+ }
	104	+
	105	+ public Date getCreated() {
	106	+ return created;
	107	+ }
	108	+
	109	+
	110	+ public void setCreated(Date created) {
	111	+ this.created = created;
	112	+
	113	+ }
	114	+}

...	...	@@ -219,7 +219,7 @@
219	219	where
220	220	mp.p_platpatientid = ppt.p_id and card.vc_patientno = mp.p_no
221	221	and mp.p_hospitalid is not null and ppt.p_id is not null and mp.p_no is not null and ppt.p_name is not null and mp.P_MOBILEPHONE is not null
222		- and ( floor((sysdate - P_LASTMENSTRUALPERIOD+1)/7) > 41 or ( SELECT COUNT(0) FROM mommy_pregDeliveryrecord pp WHERE pp.PDR_PATIENTID =mp.p_platpatientid)>0 )
	222	+ and ( floor((sysdate - P_LASTMENSTRUALPERIOD+1)/7) > 41 or ( SELECT COUNT(1) FROM mommy_pregDeliveryrecord pp WHERE pp.PDR_PATIENTID =mp.p_platpatientid)>0 )
223	223	<if test="hospitalId != null">
224	224	and mp.p_hospitalid = #{hospitalId}
225	225	</if>

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.biz.service.BasicConfigService;
4	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	5	import com.lyms.platform.common.enums.ConfigTypeEnums;
	6	+import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
6	7	import com.lyms.platform.common.enums.YnEnums;
7	8	import com.lyms.platform.common.result.BaseListResponse;
8	9	import com.lyms.platform.common.result.BaseObjectResponse;
...	...	@@ -210,6 +211,9 @@
210	211	basicConfigQuery.setParentId(basicConfig.getId());
211	212	List<BasicConfig> basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery);
212	213	if (CollectionUtils.isNotEmpty(basicConfigs2)) {
	214	+ for (BasicConfig bc:basicConfigs2) {
	215	+ bc.setColor("risk_"+ RiskDefaultTypeEnum.getColor(basicConfig.getName()));
	216	+ }
213	217	basicConfigs1.addAll(basicConfigs2);
214	218	}
215	219	}