jiangjiazhi / regional-platform

Commit 336e1a104c9747b142e4179cdd3f3dad38429a3b

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 14 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAutoDiagnoseRiskController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java

...	...	@@ -80,7 +80,7 @@
80	80	@TokenRequired
81	81	public BaseResponse autoBabyInfoRisk(@RequestBody BabyAutoRiskInfoRequest babyAutoRiskInfoRequest, HttpServletRequest request) throws Exception{
82	82	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
83		- return autoDiagnoseRiskFacade.autoBabyInfoRisk(babyAutoRiskInfoRequest);
	83	+ return autoDiagnoseRiskFacade.autoBabyInfoRisk(babyAutoRiskInfoRequest,loginState.getId());
84	84	}
85	85
86	86

...	...	@@ -97,7 +97,7 @@
97	97	List <Map <String, String>> riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), type);
98	98	autoBabyRiskRecord.setDiagnosis(riskList);
99	99	List <String> list = new ArrayList <>();
100		- getDiagnosisId(autoBabyRiskRecord,list);
	100	+ getDiagnosisId(autoBabyRiskRecord, list);
101	101	autoBabyRiskRecord.setDiagnosislist(list);
102	102
103	103
104	104
...	...	@@ -112,9 +112,10 @@
112	112	* @Author: 武涛涛
113	113	* @Date: 2020/9/3 20:54
114	114	*/
115		- public BaseResponse autoBabyInfoRisk(BabyAutoRiskInfoRequest babyAutoRiskInfoRequest) throws NoSuchFieldException, IllegalAccessException {
	115	+ public BaseResponse autoBabyInfoRisk(BabyAutoRiskInfoRequest babyAutoRiskInfoRequest, Integer userId) throws NoSuchFieldException, IllegalAccessException {
116	116	BabyAutoRiskRequest babyAutoRiskRequest = babyAutoRiskInfoRequest.convertToDataModel();
117		-
	117	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	118	+ babyAutoRiskRequest.setHospitalId(hospitalId);
118	119	//自动诊断高危
119	120	List <Map <String, String>> riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), babyAutoRiskInfoRequest.getType());
120	121
121	122
...	...	@@ -394,7 +395,13 @@
394	395	if (CollectionUtils.isNotEmpty(baby)) {
395	396	MaternalDeliverModel.Baby baby1 = baby.get(0);
396	397	if (baby1 != null) {
	398	+ //配置是g，儿童建档和检查是kg
397	399	String babyWeight = baby1.getBabyWeight();
	400	+ if ((type == 1 \|\| type == 2) && StringUtils.isNotEmpty(baby1.getBabyWeight())) {
	401	+ Double babyWe = Double.parseDouble(baby1.getBabyWeight()) * 1000;
	402	+ babyWeight = babyWe.toString();
	403	+ }
	404	+
398	405	List <DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tz.getId());
399	406	if (CollectionUtils.isNotEmpty(items) && StringUtils.isNotEmpty(babyWeight)) {
400	407	for (DiagnoseItemModel item : items) {
...	...	@@ -714,7 +721,7 @@
714	721	//MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
715	722	MongoCondition con5 = MongoCondition.newInstance("vcCardNo", antExManagerQueryRequest.getQueryNo(), MongoOper.IS);
716	723	if (c1 != null) {
717		- c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria());
	724	+ c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria());
718	725	query.addCriteria(c1);
719	726	} else {
720	727	c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria();
...	...	@@ -772,7 +779,7 @@
772	779	}
773	780	}
774	781	String risk = commonService.resloveFactor(stringLis);
775		- map.put("risk", risk);
	782	+ map.put("risk", risk);//诊断
776	783	if (model.getStatus() != null) {
777	784	map.put("status", model.getStatus() == 0 ? "未确诊" : "已确诊");
778	785	} else {

...	...	@@ -15,7 +15,7 @@
15	15	public class AntExManagerQueryRequest extends BasePageQueryRequest {
16	16	//姓名
17	17	private String name;
18		- //证件号
	18	+ //证件号babyAutoDiagnoseRisk
19	19	private String cardNo;
20	20	//孕周
21	21	private String startDueWeek;