From 6ce26ebf8b332ba535dee60bb06a868f3ed73927 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 17 Apr 2020 15:35:16 +0800 Subject: [PATCH] update --- .../lyms/platform/biz/dal/IYunBookBuildingDao.java | 2 + .../biz/dal/impl/YunBookbuildingDaoImpl.java | 5 ++ .../biz/service/YunBookbuildingService.java | 5 ++ .../java/com/lyms/platform/pojo/BabyEyeCheck.java | 20 ++++++++ .../java/com/lyms/platform/pojo/FilePathModel.java | 31 ++++++++++++ .../operate/web/request/HuadaCallbackModel.java | 2 + .../web/service/impl/BabyEyeCheckServiceImpl.java | 56 +++++++++++++++++++--- 7 files changed, 115 insertions(+), 6 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java index b249345..cdbf512 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java @@ -25,4 +25,6 @@ public interface IYunBookBuildingDao { void updateFilePath(FilePathModel obj); FilePathModel findFilePath(String patientId); + + FilePathModel findFilePathByBabyId(String babyId); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java index 1c932a0..81e530d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java @@ -65,6 +65,11 @@ public class YunBookbuildingDaoImpl extends BaseMongoDAOImpl implement } @Override + public FilePathModel findFilePathByBabyId(String babyId) { + return mongoTemplate.findOne(Query.query(Criteria.where("babyId").is(babyId)),FilePathModel.class); + } + + @Override public void updatePatient(Patients obj, String id) { update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java index e945a49..c7bc830 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java @@ -93,6 +93,11 @@ public class YunBookbuildingService { return yunBookBuildingDao.findFilePath(patientId); } + + public FilePathModel findFilePathByBabyId(String babyId) { + + return yunBookBuildingDao.findFilePathByBabyId(babyId); + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index 6ee509e..38d6359 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -304,6 +304,26 @@ public class BabyEyeCheck extends BaseModel { private String doctorJudgement; + private FilePathModel filePath; + //删除文件路径 + private List delFiles; + + public FilePathModel getFilePath() { + return filePath; + } + + public void setFilePath(FilePathModel filePath) { + this.filePath = filePath; + } + + public List getDelFiles() { + return delFiles; + } + + public void setDelFiles(List delFiles) { + this.delFiles = delFiles; + } + public String getApparatus() { return apparatus; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java index 8631925..33c9e37 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java @@ -23,6 +23,9 @@ public class FilePathModel extends BaseModel { //孕妇建档id private String patientId; + //儿童眼保健档案id + private String babyEyeId; + //孕妇身份证正面 private String cardNoz; //孕妇身份证反面 @@ -52,6 +55,34 @@ public class FilePathModel extends BaseModel { private String hfacePatient; + private String eyeOnePath; + + private String eyeTwoPath; + + public String getBabyEyeId() { + return babyEyeId; + } + + public void setBabyEyeId(String babyEyeId) { + this.babyEyeId = babyEyeId; + } + + public String getEyeOnePath() { + return eyeOnePath; + } + + public void setEyeOnePath(String eyeOnePath) { + this.eyeOnePath = eyeOnePath; + } + + public String getEyeTwoPath() { + return eyeTwoPath; + } + + public void setEyeTwoPath(String eyeTwoPath) { + this.eyeTwoPath = eyeTwoPath; + } + public String getId() { return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java index 3b02ba9..13868f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java @@ -49,6 +49,8 @@ public class HuadaCallbackModel { private String productLines;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[], private String productCodes;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[] + private String reportType; //报告类型 正式报告、失败报告、重取样报告 + public String getZ13ZScore() { return z13ZScore; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 3d3519a..c4b66e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.pojo.SyncDataModel; import com.lyms.platform.common.result.*; @@ -9,6 +10,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.facade.OperateLogFacade; import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; +import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import com.lyms.platform.operate.web.service.BabyAfterVisitService; import com.lyms.platform.operate.web.service.BabyEyeCheckService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -19,6 +21,7 @@ import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.pojo.BabyEyeCheck; import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.FilePathModel; import com.lyms.platform.pojo.Patients; import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +33,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; import java.util.*; @@ -44,12 +48,6 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC private BabyEyeCheckMapper babyEyeCheckMapper; @Autowired - private BasicConfigService basicConfigService; - - @Autowired - private BasicConfigFacade basicConfigFacade; - - @Autowired private AutoMatchFacade autoMatchFacade; @Autowired @@ -68,8 +66,13 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC private BabyAfterVisitService babyAfterVisitService; @Autowired + private YunBookbuildingService yunBookbuildingService; + + @Autowired private OperateLogFacade operateLogFacade; + public static final String BASE_IMG_PATH = PropertiesUtils.getPropertyValue("img_path"); + public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0"); @Override @@ -168,9 +171,43 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } } + + if (CollectionUtils.isNotEmpty(babyEyeCheck.getDelFiles())) + { + deleteImg(babyEyeCheck); + } + FilePathModel filePath = babyEyeCheck.getFilePath(); + if (filePath != null && filePath.getId() == null) { + filePath.setBabyEyeId(babyEyeCheck.getBabyId()); + yunBookbuildingService.addFilePath(filePath); + } + else if (filePath != null) + { + yunBookbuildingService.updateFilePath(filePath); + } + return RespBuilder.buildSuccess(babyEyeCheck.getId()); } + + + public void deleteImg(BabyEyeCheck babyEyeCheck) { + List files = new ArrayList<>(); + List delFiles = babyEyeCheck.getDelFiles(); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(delFiles)) { + files.addAll(delFiles); + } + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(files)) { + for (String filePath : files) { + File filepath = new File(BASE_IMG_PATH + File.separator + filePath); + if (filepath.exists()) { + filepath.delete(); + } + } + } + + } + @Override public BaseResponse info(String id) { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); @@ -276,6 +313,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("vision2", "yang".equals(babyEyeCheck.getVision2()) ? "医生判定阳性" : ""); map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : ""); map.put("refraction2", "yang".equals(babyEyeCheck.getRefraction2()) ? "医生判定阳性" : ""); + + FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getBabyId()); + map.put("filePath", filePath); // CollectionUtils.removeNullValue(map); return RespBuilder.buildSuccess(map); @@ -312,6 +352,10 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { map.put("checkMonthId", babyEyeCheck.getCheckMonthId() + ""); } + + FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getBabyId()); + map.put("filePath", filePath); + map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); if (babyEyeCheck.getRiskFactorId() != null) { List riskFactorId = babyEyeCheck.getRiskFactorId(); -- 1.8.3.1