diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 252395a..52bcfd0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -180,6 +180,8 @@ public class BabyBookbuildingFacade {
@Autowired
private BabyAfterVisitService babyAfterVisitService;
+ @Autowired
+ private BabyEarFacade babyEarFacade;
public BaseResponse getBabyBase(String babyId) {
//查询儿童的基本信息
@@ -774,6 +776,31 @@ public class BabyBookbuildingFacade {
model.setEndCase(0);//秦皇岛,默认未结案
model = babyBookbuildingService.addBabyBookbuilding(model);
+ /**
+ * start
+ * 眼保健保存建档时候,保存听力产筛档案
+ * @Author: 武涛涛
+ * @Date: 2020/7/22 15:42
+ */
+ BaseObjectResponse babyEarById = (BaseObjectResponse) babyEarFacade.findBabyEarById(model.getId());
+ BabyEarResult babyEarResult = (BabyEarResult) babyEarById.getData();//获取要保存的眼保健档案 /babyear
+
+ BabyEarAddRequest babyEarAddRequest = new BabyEarAddRequest();
+ babyEarAddRequest.setBase(babyEarResult.getBase());
+ babyEarAddRequest.setBabyBirth(babyEarResult.getBabyBirth());
+ BabyPatientExtendEarMotherRequest patientExtendEarMother = new BabyPatientExtendEarMotherRequest();
+ Map hSTMap = new HashMap();
+ List jcsjUnitList = new ArrayList();
+ Map map1 = new HashMap();
+ map1.put("jcsjUnit", "1");
+ jcsjUnitList.add(map1);
+ hSTMap.put("lists", jcsjUnitList);
+ patientExtendEarMother.setHarmfulSubstanceType(hSTMap);
+ babyEarAddRequest.setPatientExtendEarMother(patientExtendEarMother);//数据模仿前端默认数据参数
+ babyEarAddRequest.setPatientExtendEarFamily(babyEarResult.getPatientExtendEarFamily());
+ babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest, userId);//听力筛查建档/babyear
+ /*end */
+
// 更新追访概况,作废档案转正
babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD);
//babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO);
@@ -1074,8 +1101,10 @@ public class BabyBookbuildingFacade {
patient.setType(3);
return patient;
}
+
@Autowired
private IBabyBookBuildingDao babyBookBuildingDao;
+
/**
* 封装保存对象
*
@@ -1092,7 +1121,7 @@ public class BabyBookbuildingFacade {
}
// 编码,新增时候增加修改不做处理
- if(StringUtils.isEmpty(b.getId())){
+ if (StringUtils.isEmpty(b.getId())) {
bm.setEncoded(getEncodedUtil());
}
//新生儿民族Id
@@ -1303,7 +1332,7 @@ public class BabyBookbuildingFacade {
/**
* 编码生成
- *
+ *
* 生成规则20200721后面加001以此累加
* 先获取已使用的累加序号,递增生成。
* 如果当天没有序号那就从当前时间+001开始
@@ -1321,14 +1350,14 @@ public class BabyBookbuildingFacade {
babyQuery.setEncoded(true);
MongoQuery query = babyQuery.convertToQuery();
List list = babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "created"));
- if(CollectionUtils.isNotEmpty(list)){
+ if (CollectionUtils.isNotEmpty(list)) {
BabyModel babyModel = list.get(0);
- if(StringUtils.isNotEmpty(babyModel.getEncoded()) && babyModel.getEncoded().length()>8){
+ if (StringUtils.isNotEmpty(babyModel.getEncoded()) && babyModel.getEncoded().length() > 8) {
String encoded = babyModel.getEncoded().substring(8, babyModel.getEncoded().length());//20200721003
- return DateUtil.getDateNumber(encoded);
+ return DateUtil.getDateNumber(encoded);
}
}
- return DateUtil.getDateNumber("0");
+ return DateUtil.getDateNumber("0");
} catch (Exception e) {
e.printStackTrace();
}
@@ -1441,7 +1470,7 @@ public class BabyBookbuildingFacade {
result.setBabyHighRiskReason(mongoUtil.findColor(model.getBabyHighRiskReason()));
List