jiangjiazhi / regional-platform

Commit e0f9318cc5415e567d62a2265239faefb04a1d34

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

隆化-儿保-儿童管理牙齿2项筛选改用新口腔模块数据

Showing 6 changed files with 222 additions and 50 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.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/BabyOralCheckFacade.java

...	...	@@ -746,7 +746,7 @@
746	746
747	747	//隆化-口腔检查同步数据
748	748	/**
749		- * 检查记录状态（同步字段，最后一次检查的id）
	749	+ * 检查记录状态（同步字段）
750	750	* 这里查询关于口腔的数据必须要这个字段
751	751	*/
752	752	private Integer oralCheckYn;
753	753
754	754
755	755
756	756
757	757
758	758
...	...	@@ -778,25 +778,169 @@
778	778	*/
779	779	private List<String> oralHighRisk;
780	780	/**
781		- * 龋齿
	781	+ * 出牙数状态状态(同步字段 1正常2异常)
782	782	*/
	783	+ private String ycsz;
	784	+ /**
	785	+ * 出牙数(同步字段 )
	786	+ */
	787	+ private String ycszCount;
	788	+ /**
	789	+ * 龋齿(同步字段)
	790	+ */
783	791	private String qc;
784	792	/**
785		- * 护齿
	793	+ * 护齿(同步字段)
786	794	*/
787	795	private String hc;
788	796	/**
789		- * 窝沟封闭
	797	+ * 窝沟封闭(同步字段)
790	798	*/
791	799	private String wgfb;
792	800	/**
793		- * 检查月龄套餐
	801	+ * 检查月龄套餐(同步字段)
794	802	*/
795	803	private String oralCheckMonthId;
796	804	/**
797		- * 检查月龄
	805	+ * 检查月龄(同步字段)
798	806	*/
799	807	private String oralCheckMonthAge;
	808	+
	809	+ /*************************************************************************************/
	810	+ //隆化-眼保健检查同步字段
	811	+
	812	+ /**
	813	+ * _id（同步字段，最后一次检查的id lhEyeCheckId）
	814	+ */
	815	+ private String lhEyeCheckId;
	816	+
	817	+ /**
	818	+ * 记录删除状态0：删除 1：正常（同步字段 lheyeCheckYn）
	819	+ */
	820	+ private Integer lheyeCheckYn;
	821	+
	822	+ /**
	823	+ * 检查月龄（同步字段 lhEyeCheckMonthAge）
	824	+ */
	825	+ private String lhEyeCheckMonthAge;
	826	+
	827	+ /**
	828	+ * 检查月龄套餐（同步字段 lhEyeCheckMonthId）
	829	+ */
	830	+ private String lhEyeCheckMonthId;
	831	+
	832	+ /**
	833	+ * 检查时间（同步字段 lhEyeCheckTime）
	834	+ */
	835	+ private Date lhEyeCheckTime;
	836	+
	837	+ /**
	838	+ * 预约下次检查时间(同步字段 lhNextEyeCheckTime)
	839	+ */
	840	+ private Date lhNextEyeCheckTime;
	841	+
	842	+ /**
	843	+ * 检查医生（同步字段 lhEyeCheckDoctor）
	844	+ */
	845	+ private String lhEyeCheckDoctor;
	846	+
	847	+ /**
	848	+ * 阳性状态1:正常 2:阳性（同步字段 lhEyePositiveType）
	849	+ */
	850	+ private String lhEyePositiveType;
	851	+
	852	+ /**
	853	+ * 高危(同步字段 lhEyeHighRisk)
	854	+ */
	855	+ private List<String> lhEyeHighRisk;
	856	+
	857	+ public String getLhEyeCheckId() {
	858	+ return lhEyeCheckId;
	859	+ }
	860	+
	861	+ public void setLhEyeCheckId(String lhEyeCheckId) {
	862	+ this.lhEyeCheckId = lhEyeCheckId;
	863	+ }
	864	+
	865	+ public Integer getLheyeCheckYn() {
	866	+ return lheyeCheckYn;
	867	+ }
	868	+
	869	+ public void setLheyeCheckYn(Integer lheyeCheckYn) {
	870	+ this.lheyeCheckYn = lheyeCheckYn;
	871	+ }
	872	+
	873	+ public String getLhEyeCheckMonthAge() {
	874	+ return lhEyeCheckMonthAge;
	875	+ }
	876	+
	877	+ public void setLhEyeCheckMonthAge(String lhEyeCheckMonthAge) {
	878	+ this.lhEyeCheckMonthAge = lhEyeCheckMonthAge;
	879	+ }
	880	+
	881	+ public String getLhEyeCheckMonthId() {
	882	+ return lhEyeCheckMonthId;
	883	+ }
	884	+
	885	+ public void setLhEyeCheckMonthId(String lhEyeCheckMonthId) {
	886	+ this.lhEyeCheckMonthId = lhEyeCheckMonthId;
	887	+ }
	888	+
	889	+ public Date getLhEyeCheckTime() {
	890	+ return lhEyeCheckTime;
	891	+ }
	892	+
	893	+ public void setLhEyeCheckTime(Date lhEyeCheckTime) {
	894	+ this.lhEyeCheckTime = lhEyeCheckTime;
	895	+ }
	896	+
	897	+ public Date getLhNextEyeCheckTime() {
	898	+ return lhNextEyeCheckTime;
	899	+ }
	900	+
	901	+ public void setLhNextEyeCheckTime(Date lhNextEyeCheckTime) {
	902	+ this.lhNextEyeCheckTime = lhNextEyeCheckTime;
	903	+ }
	904	+
	905	+ public String getLhEyeCheckDoctor() {
	906	+ return lhEyeCheckDoctor;
	907	+ }
	908	+
	909	+ public void setLhEyeCheckDoctor(String lhEyeCheckDoctor) {
	910	+ this.lhEyeCheckDoctor = lhEyeCheckDoctor;
	911	+ }
	912	+
	913	+ public String getLhEyePositiveType() {
	914	+ return lhEyePositiveType;
	915	+ }
	916	+
	917	+ public void setLhEyePositiveType(String lhEyePositiveType) {
	918	+ this.lhEyePositiveType = lhEyePositiveType;
	919	+ }
	920	+
	921	+ public List<String> getLhEyeHighRisk() {
	922	+ return lhEyeHighRisk;
	923	+ }
	924	+
	925	+ public void setLhEyeHighRisk(List<String> lhEyeHighRisk) {
	926	+ this.lhEyeHighRisk = lhEyeHighRisk;
	927	+ }
	928	+
	929	+ public String getYcsz() {
	930	+ return ycsz;
	931	+ }
	932	+
	933	+ public void setYcsz(String ycsz) {
	934	+ this.ycsz = ycsz;
	935	+ }
	936	+
	937	+ public String getYcszCount() {
	938	+ return ycszCount;
	939	+ }
	940	+
	941	+ public void setYcszCount(String ycszCount) {
	942	+ this.ycszCount = ycszCount;
	943	+ }
800	944
801	945	public String getOralCheckMonthAge() {
802	946	return oralCheckMonthAge;

...	...	@@ -19,9 +19,8 @@
19	19	*/
20	20	@Document(collection = "lyms_baby_oral_check")
21	21	public class BabyOralCheck extends BaseModel {
22		- private static final long serialVersionUID = SerialIdEnum.BabyEyeCheck.getCid();
23	22	/**
24		- * _id
	23	+ * _id （同步字段，最后一次检查的id oralCheckId）
25	24	*/
26	25	private String id;
27	26
28	27
...	...	@@ -95,11 +94,11 @@
95	94	*/
96	95	private String pid;
97	96	/**
98		- * 检查月龄
	97	+ * 检查月龄（同步字段 oralCheckMonthAge）
99	98	*/
100	99	private String checkMonthAge;
101	100	/**
102		- * 检查月龄套餐
	101	+ * 检查月龄套餐（同步字段 oralCheckMonthId）
103	102	*/
104	103	private String checkMonthId;
105	104	/**
106	105
...	...	@@ -116,12 +115,12 @@
116	115	private String schoolId;
117	116
118	117	/**
119		- * 检查时间（同步字段）
	118	+ * 检查时间（同步字段oralCheckTime）
120	119	*/
121	120	private Date oralCheckTime;
122	121
123	122	/**
124		- * 预约下次检查时间(同步字段)
	123	+ * 预约下次检查时间(同步字段 nextOralCheckTime)
125	124	*/
126	125	private Date nextOralCheckTime;
127	126	/**
128	127
129	128
...	...	@@ -130,16 +129,16 @@
130	129	private String nextCheckMonthId;
131	130
132	131	/**
133		- * 检查医生（同步字段）
	132	+ * 检查医生（同步字段 oralCheckDoctor）
134	133	*/
135	134	private String oralCheckDoctor;
136	135
137	136	/**
138		- * 阳性状态1:正常 2:阳性（同步字段）
	137	+ * 阳性状态1:正常 2:阳性（同步字段positiveType）
139	138	*/
140	139	private String positiveType;
141	140	/**
142		- * 口腔高危(同步字段)
	141	+ * 口腔高危(同步字段oralHighRisk)
143	142	*/
144	143	private List<String> oralHighRisk;
145	144	/**
146	145
147	146
148	147
149	148
...	...	@@ -152,20 +151,23 @@
152	151	private String oralIllness;
153	152
154	153	/**
155		- * 牙齿生长数量
	154	+ * 牙齿生长数量 1正常2异常(同步字段 ycsz)
156	155	*/
157	156	private String ycsz;
	157	+ /**
	158	+ * 出牙数(同步字段 ycszCount)
	159	+ */
158	160	private String ycszCount;
159	161	/**
160		- * 护齿
	162	+ * 护齿(同步字段 hc)
161	163	*/
162	164	private String hc;
163	165	/**
164		- * 窝沟封闭
	166	+ * 窝沟封闭(同步字段 wgfb)
165	167	*/
166	168	private String wgfb;
167	169	/**
168		- * 龋齿
	170	+ * 龋齿(同步字段 qc)
169	171	*/
170	172	private String qc;
171	173	private String qcText;
...	...	@@ -307,10 +309,6 @@
307	309
308	310	public void setBirth(Date birth) {
309	311	this.birth = birth;
310		- }
311		-
312		- public static long getSerialVersionUID() {
313		- return serialVersionUID;
314	312	}
315	313
316	314	public String getId() {

...	...	@@ -1365,7 +1365,7 @@
1365	1365	*/
1366	1366	private List<String> oralHighRisk;
1367	1367	/**
1368		- * 龋齿从几开始(个数)
	1368	+ * 龋齿从几开始(个数),儿童管理模块龋齿异常筛选:传1表示大于等于1的都算异常龋齿（大于0的都是异常）
1369	1369	*/
1370	1370	private String qcStart;
1371	1371	/**
...	...	@@ -1393,6 +1393,20 @@
1393	1393	*/
1394	1394	private Integer queryMonthAgeEnd;
1395	1395
	1396	+ /**
	1397	+ * 牙齿生长数量 1正常2异常
	1398	+ */
	1399	+ private String ycsz;
	1400	+
	1401	+
	1402	+ public String getYcsz() {
	1403	+ return ycsz;
	1404	+ }
	1405	+
	1406	+ public void setYcsz(String ycsz) {
	1407	+ this.ycsz = ycsz;
	1408	+ }
	1409	+
1396	1410	public Integer getOralCheckYn() {
1397	1411	return oralCheckYn;
1398	1412	}
...	...	@@ -1981,6 +1995,9 @@
1981	1995	}
1982	1996	if (null != oralCheckYn) {
1983	1997	condition = condition.and("oralCheckYn", oralCheckYn, MongoOper.IS);
	1998	+ }
	1999	+ if (StringUtils.isNotEmpty(ycsz)) {
	2000	+ condition = condition.and("ycsz", ycsz, MongoOper.IS);
1984	2001	}
1985	2002
1986	2003	Criteria c = null;

...	...	@@ -118,10 +118,15 @@
118	118	private List<String> oralHighRisk;
119	119
120	120	/**
121		- * 牙齿生长数量
	121	+ * 牙齿生长数量-1正常2异常
122	122	*/
123	123	private String ycsz;
	124	+
	125	+ /**
	126	+ * 出牙数
	127	+ */
124	128	private String ycszCount;
	129	+
125	130	/**
126	131	* 护齿（1已做/2未做）
127	132	*/
...	...	@@ -238,6 +243,9 @@
238	243	}
239	244	if (StringUtils.isNotEmpty(wgfb)) {
240	245	condition = condition.and("wgfb", wgfb, MongoOper.IS);
	246	+ }
	247	+ if (StringUtils.isNotEmpty(ycsz)) {
	248	+ condition = condition.and("ycsz", ycsz, MongoOper.IS);
241	249	}
242	250
243	251	Criteria c = null;

...	...	@@ -3399,15 +3399,18 @@
3399	3399	babyQuery.setQueryNo(request.getQueryNo());
3400	3400	//滦平、隆化-儿保管理-全部加健康/高危筛选
3401	3401	babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null);
	3402	+ //用隆华新口腔模块中数据筛选牙齿异常2项
	3403	+ babyQuery.setYcsz(null!=request.getCyNumType()?request.getCyNumType().toString():"");
	3404	+ babyQuery.setQcStart(null!=request.getQcNumType()?2==request.getCyNumType()?"1":"":"");
3402	3405	System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString());
3403		- //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音筛选
	3406	+ //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音筛选(这里牙齿异常2项不用了，用隆华新做的口腔模块代替)
3404	3407	if(StringUtils.isNotEmpty(request.getMildAnaemia())\|\|StringUtils.isNotEmpty(request.getModerateAnaemia())\|\|
3405		- StringUtils.isNotEmpty(request.getHeartMurmur())\|\|null!=request.getCyNumType()\|\|null!=request.getQcNumType()){
	3408	+ StringUtils.isNotEmpty(request.getHeartMurmur())){//\|\|null!=request.getCyNumType()\|\|null!=request.getQcNumType()
3406	3409	final String mildAnaemia=request.getMildAnaemia();
3407	3410	final String moderateAnaemia=request.getModerateAnaemia();
3408	3411	final String heartMurmur=request.getHeartMurmur();
3409		- final Integer cyNumType=request.getCyNumType();
3410		- final Integer qcNumType=request.getQcNumType();
	3412	+// final Integer cyNumType=request.getCyNumType();
	3413	+// final Integer qcNumType=request.getQcNumType();
3411	3414	List<BabyModel> list=babyBookbuildingService.queryBabyBuildByCond(babyQuery);
3412	3415	Set<String> data = new HashSet<>();
3413	3416	int batchSize = 20;
...	...	@@ -3436,27 +3439,27 @@
3436	3439	if (StringUtils.isNotEmpty(heartMurmur)) {
3437	3440	query.addCriteria(Criteria.where("heartMurmur").is(heartMurmur));
3438	3441	}
3439		- if (null != cyNumType) {
3440		- if (cyNumType == 1) {//正常
3441		- Criteria criteria = new Criteria();
3442		- Criteria criteria1 = Criteria.where("cyNumType").is(cyNumType);
3443		- Criteria criteria2 = Criteria.where("cyNumType").exists(false);
3444		- criteria.orOperator(criteria2, criteria1);
3445		- query.addCriteria(criteria1);//如需兼容历史数据用criteria。没有该字段的暂时默认正常
3446		- }
3447		- if (cyNumType == 2) {//异常
3448		- query.addCriteria(Criteria.where("cyNumType").is(cyNumType));
3449		- }
3450		- }
3451		- if (null != qcNumType) {
3452		- if (qcNumType == 2) {//异常
3453		- //字符串判断大小
3454		- String formatQcNum = String.format("function() {\n" +
3455		- " return this.qcNum > %s \n" +
3456		- " }", "0");
3457		- query.addCriteria(Criteria.where("$where").is(formatQcNum));
3458		- }
3459		- }
	3442	+// if (null != cyNumType) {
	3443	+// if (cyNumType == 1) {//正常
	3444	+// Criteria criteria = new Criteria();
	3445	+// Criteria criteria1 = Criteria.where("cyNumType").is(cyNumType);
	3446	+// Criteria criteria2 = Criteria.where("cyNumType").exists(false);
	3447	+// criteria.orOperator(criteria2, criteria1);
	3448	+// query.addCriteria(criteria1);//如需兼容历史数据用criteria。没有该字段的暂时默认正常
	3449	+// }
	3450	+// if (cyNumType == 2) {//异常
	3451	+// query.addCriteria(Criteria.where("cyNumType").is(cyNumType));
	3452	+// }
	3453	+// }
	3454	+// if (null != qcNumType) {
	3455	+// if (qcNumType == 2) {//异常
	3456	+// //字符串判断大小
	3457	+// String formatQcNum = String.format("function() {\n" +
	3458	+// " return this.qcNum > %s \n" +
	3459	+// " }", "0");
	3460	+// query.addCriteria(Criteria.where("$where").is(formatQcNum));
	3461	+// }
	3462	+// }
3460	3463
3461	3464	BabyCheckModel checkModel = mongoTemplate.findOne(query, BabyCheckModel.class);
3462	3465	if (null != checkModel) {

...	...	@@ -127,6 +127,8 @@
127	127	update.set("hc",babyOralCheck.getHc() );
128	128	update.set("wgfb",babyOralCheck.getWgfb() );
129	129	update.set("oralCheckMonthAge",babyOralCheck.getCheckMonthAge() );
	130	+ update.set("ycsz",babyOralCheck.getYcsz() );
	131	+ update.set("ycszCount",babyOralCheck.getYcszCount() );
130	132	mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyOralCheck.getBabyId())), update, BabyModel.class);
131	133	}
132	134