jiangjiazhi / regional-platform

Commit 4c13018d0e050886931fe96bf21f41b316b3fd93

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 79 additions and 9 deletions

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/facade/MatDeliverFacade.java

...	...	@@ -862,7 +862,7 @@
862	862	* @Author: 武涛涛
863	863	* @Date: 2020/9/3 15:22
864	864	*/
865		- public BaseResponse updateStatus(AutoBabyRiskRecord autoBabyRiskRecord, Integer userId) {
	865	+ public BaseResponse updateStatus_2021back(AutoBabyRiskRecord autoBabyRiskRecord, Integer userId) {
866	866	//当前登录人医院Id
867	867	String hospitalId = autoMatchFacade.getHospitalId(userId);
868	868	AutoBabyRiskRecord autoBabyRiskRecord1 = queryById(autoBabyRiskRecord.getId());
869	869
870	870
...	...	@@ -912,11 +912,70 @@
912	912	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
913	913	}
914	914
	915	+ public BaseResponse updateStatus(AutoBabyRiskRecord autoBabyRiskRecord, Integer userId) {
	916	+ //当前登录人医院Id
	917	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	918	+ AutoBabyRiskRecord autoBabyRiskRecord1 = queryById(autoBabyRiskRecord.getId());
	919	+ if(autoBabyRiskRecord1 ==null){
	920	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有改数据");
	921	+ }
915	922
	923	+ //修改成确认状态后，修改最后一条检查诊断，或修改儿童建档诊断
	924	+ BabyCheckModelQuery query = new BabyCheckModelQuery();
	925	+ query.setYn(YnEnums.YES.getId());
	926	+ query.setBuildId(autoBabyRiskRecord1.getBabyId());
	927	+ //查询儿童的检查记录
	928	+ List<BabyCheckModel> babyCheckModels = babyCheckService.queryBabyCheckRecord(query);
	929	+ //诊断listmap转liststring
	930	+ List<String> list = new ArrayList<>();
	931	+ List<String> stringList = new ArrayList<>();
	932	+ getDiagnosisId(autoBabyRiskRecord1, list);
	933	+ boolean bb = false;
	934	+ if (CollectionUtils.isNotEmpty(babyCheckModels)) {
	935	+ bb = true;
	936	+ BabyCheckModel babyCheckModel = babyCheckModels.get(0);
	937	+ if (babyCheckModel != null && StringUtils.isNotEmpty(babyCheckModel.getDiagnose())) {
	938	+ stringList = JsonUtil.toList(babyCheckModel.getDiagnose(), String.class);
	939	+ }
	940	+ if (CollectionUtils.isNotEmpty(list)) {
	941	+ stringList.addAll(list);
	942	+ JSONArray jsonArray = JSONArray.fromObject(stringList);
	943	+ mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyCheckModel.getId())), Update.update("diagnose", jsonArray.toString()).set("highRisk", 1), BabyCheckModel.class);
	944	+ }
	945	+ } else if (CollectionUtils.isEmpty(babyCheckModels)) {
	946	+ Set<String> setbabyModel = new HashSet<>();
	947	+ BabyModelQuery babyQuery = new BabyModelQuery();
	948	+ babyQuery.setId(autoBabyRiskRecord1.getBabyId());
	949	+ babyQuery.setYn(YnEnums.YES.getId());
	950	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	951	+ if (CollectionUtils.isNotEmpty(models)) {
	952	+ bb = true;
	953	+ BabyModel babyModel = models.get(0);
	954	+ List<String> babyModelList = JsonUtil.toList(babyModel.getDiagnose(), String.class);
	955	+ setbabyModel.addAll(babyModelList);
	956	+
	957	+ if (CollectionUtils.isNotEmpty(list)) {
	958	+ setbabyModel.addAll(list);
	959	+ JSONArray jsonArray = JSONArray.fromObject(setbabyModel);
	960	+ mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyModel.getId())), Update.update("diagnose", jsonArray.toString()).set("highRisk", 1), BabyModel.class);
	961	+ }
	962	+ }
	963	+ }
	964	+
	965	+ if (autoBabyRiskRecord1 != null && autoBabyRiskRecord1.getId() != null && bb) {
	966	+ mongoTemplate.updateFirst(new Query(Criteria.where("id").is(autoBabyRiskRecord1.getId())), Update.update("status", 1), AutoBabyRiskRecord.class);
	967	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	968	+ }else {
	969	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败");
	970	+ }
	971	+
	972	+
	973	+ }
	974	+
916	975	public BaseResponse saveLisBabyData(List<LisResultModelRequest> lisResultModelRequests) {
917	976
918	977	for (LisResultModelRequest modelRequest : lisResultModelRequests) {
919		-
	978	+ System.out.println("----1----getHospitalId: "+modelRequest.getHospitalId()+"---------getVcCardNo: "+modelRequest.getVcCardNo()+"--------getXhdb: "+modelRequest.getXhdb());
920	979	if (StringUtils.isEmpty(modelRequest.getHospitalId()) \|\| StringUtils.isEmpty(modelRequest.getVcCardNo()) \|\| StringUtils.isEmpty(modelRequest.getXhdb())) {
921	980	continue;
922	981	}
...	...	@@ -925,6 +984,7 @@
925	984	babyQuery.setHospitalId(modelRequest.getHospitalId());//查询上传医院儿童档案
926	985	babyQuery.setVcCardNo(modelRequest.getVcCardNo());
927	986	List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	987	+ System.out.println("--2-------builds-------"+builds.size());
928	988	if (CollectionUtils.isNotEmpty(builds)) {
929	989	BabyModel babyModel = builds.get(0);
930	990	if (babyModel == null && StringUtils.isEmpty(babyModel.getId())) {
...	...	@@ -935,6 +995,8 @@
935	995	query.setYn(YnEnums.YES.getId());
936	996	query.setBuildId(babyModel.getId());
937	997	List<BabyCheckModel> babyCheckModels = babyCheckService.queryBabyCheckRecord(query);
	998	+ System.out.println("--3-------babyCheckModels-------"+babyCheckModels.size());
	999	+
938	1000	if (CollectionUtils.isEmpty(babyCheckModels)) {
939	1001	continue;
940	1002	}
...	...	@@ -946,7 +1008,9 @@
946	1008	Set<String> setbabyModel = new HashSet<>();
947	1009	List<String> babyModelList = new ArrayList<>();
948	1010	try {
949		- babyModelList = JsonUtil.toList(babyCheckModel.getDiagnose(), String.class);
	1011	+// babyModelList = JsonUtil.toList(babyCheckModel.getDiagnose(), String.class);
	1012	+ babyModelList = babyCheckModel.getHighRiskInfo();
	1013	+ System.out.println("--4-------babyModelList-------"+babyModelList.size());
950	1014	} catch (Exception e) {
951	1015	e.printStackTrace();
952	1016	}
953	1017
954	1018
955	1019
956	1020
957	1021
...	...	@@ -960,26 +1024,32 @@
960	1024	babies.add(baby);
961	1025	babyAutoRiskRequest.setBabies(babies);
962	1026	List<Map<String, String>> maps = autoRisk(babyAutoRiskRequest, babyCheckModel.getHospitalId(), 2, 0);
	1027	+ System.out.println("--5-------maps-------"+maps.size());
	1028	+
963	1029	babyModelList.addAll(getListMap(maps));
964	1030	} catch (Exception e) {
965	1031	e.printStackTrace();
966	1032	}
967		- // 注意：这里是不管以前有没有血红蛋白都会累加高危
	1033	+ // 注意：这里是不管以前有没有血红蛋白都会累加高危，更新血红蛋白
968	1034	setbabyModel.addAll(babyModelList);
969		-
	1035	+ System.out.println("--6-------maps-------"+setbabyModel.size());
970	1036	if(CollectionUtils.isNotEmpty(babyModelList)){
971	1037	BabyCheckModel model = new BabyCheckModel();
972		- JSONArray jsonArray = JSONArray.fromObject(setbabyModel);
973		- model.setDiagnose(jsonArray.toString());
	1038	+// JSONArray jsonArray = JSONArray.fromObject(setbabyModel);
	1039	+// model.setDiagnose(jsonArray.toString());
	1040	+ model.setHighRiskInfo(new ArrayList<>(setbabyModel));
974	1041	model.setHighRisk(1);
975	1042	model.setHemoglobin(modelRequest.getXhdb());
976	1043	model.setModified(new Date());
977	1044	babyCheckService.updateBabyCheck(model, babyCheckModel.getId());
	1045	+ System.out.println("--------7.1--------------"+babyCheckModel.getId());
978	1046	}else if(StringUtils.isEmpty(babyCheckModel.getHemoglobin())){//以前有血红蛋白，没有自动诊断高危是不更新
979	1047	BabyCheckModel model = new BabyCheckModel();
980	1048	model.setHemoglobin(modelRequest.getXhdb());
981	1049	model.setModified(new Date());
982	1050	babyCheckService.updateBabyCheck(model, babyCheckModel.getId());
	1051	+ System.out.println("--------7.2--------------"+babyCheckModel.getId());
	1052	+
983	1053	}
984	1054
985	1055

...	...	@@ -448,7 +448,7 @@
448	448	//新增分娩信息
449	449	matDeliverService.addMatDeliver(maternalDeliverModel);
450	450
451		- //儿童自动诊断
	451	+ /*//儿童自动诊断,20210109 张洁说分娩时候不用自动诊断
452	452	try {
453	453	List <MaternalDeliverModel.Baby> baby = maternalDeliverModel.getBaby();
454	454	for (int i = 0; i <baby.size() ; i++) {
...	...	@@ -474,7 +474,7 @@
474	474
475	475	} catch (Exception e) {
476	476	e.printStackTrace();
477		- }
	477	+ }*/
478	478
479	479
480	480	operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, OptActionEnums.ADD.getId(), "添加分娩");