diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
index 38619ed..49bab24 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
@@ -97,6 +97,9 @@ public class AntExRecordService {
}
+
+
+
public AntExRecordModel convert(AntenatalExaminationModel antEx) {
AntExRecordModel antExRecordModel = new AntExRecordModel();
antExRecordModel.setParentId(antEx.getParentId());
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java
index 58b180d..416d3b9 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java
@@ -7,6 +7,7 @@ import com.lyms.platform.common.dao.operator.MongoOper;
import com.lyms.platform.common.dao.operator.MongoQuery;
import com.lyms.platform.common.enums.YnEnums;
import com.lyms.platform.pojo.AntExChuModel;
+import com.lyms.platform.pojo.AntExRecordModel;
import com.lyms.platform.pojo.AntenatalExaminationModel;
import com.lyms.platform.query.AntExChuQuery;
import com.lyms.platform.query.VisitQuery;
@@ -20,7 +21,7 @@ import java.util.List;
/**
* 产前检查服务实现
- *
+ *
* Created by Administrator on 2016/6/16 0016.
*/
@Service
@@ -29,11 +30,13 @@ public class AntenatalExaminationService {
private IAntenatalExaminationDao iAntenatalExaminationDao;
@Autowired
private IAntExChuDao iAntExChuDao;
+ @Autowired
+ private AntExRecordService antExRecordService;
public List findAllByParentId(String parentId) {
Assert.notNull(parentId, "findAllByParentId parentId must not be null.");
- MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS).and("yn", YnEnums.YES.getId(),MongoOper.IS);
- return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.DESC,"created"));
+ MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS);
+ return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.DESC, "created"));
}
@@ -43,12 +46,14 @@ public class AntenatalExaminationService {
/**
* 查询条数
+ *
* @param query
* @return
*/
- public int queryAntExChuCount(MongoQuery query){
- return (int)iAntExChuDao.count(query);
+ public int queryAntExChuCount(MongoQuery query) {
+ return (int) iAntExChuDao.count(query);
}
+
/**
* 按条件查询所有
*
@@ -80,10 +85,31 @@ public class AntenatalExaminationService {
Assert.notNull(babyVisitModel, "addOneBabyAnt babyVisitModel must not be null.");
babyVisitModel.setCreated(new Date());
babyVisitModel.setModified(new Date());
+
return iAntenatalExaminationDao.addOneAntenatalExamination(babyVisitModel);
}
/**
+ * @param id
+ * @param type 1 初诊 2 复诊
+ */
+ public void updateAntExRecord(String id, int type) {
+ AntExRecordModel antExRecordModel = null;
+ if (type == 2) {
+ AntenatalExaminationModel ant = findOneById(id);
+ antExRecordModel = antExRecordService.convert(ant);
+ } else {
+ AntExChuModel chu = findOne(id);
+ antExRecordModel = antExRecordService.convert(chu);
+ }
+
+ if (null != antExRecordModel) {
+ antExRecordService.addOneRecord(antExRecordModel);
+ }
+ }
+
+
+ /**
* 修改一条新生儿访视记录
*
* @param babyVisitModel 新生儿访视记录模型
@@ -93,6 +119,7 @@ public class AntenatalExaminationService {
Assert.notNull(id, "updateOneAnt id must not be null.");
babyVisitModel.setModified(new Date());
iAntenatalExaminationDao.updateAntenatalExamination(babyVisitModel, id);
+
}
/**
@@ -115,6 +142,7 @@ public class AntenatalExaminationService {
public void updateAntExChu(AntExChuModel antExChuModel, String id) {
antExChuModel.setModified(new Date());
iAntExChuDao.updateOneAntEx(antExChuModel, id);
+
}
/**
@@ -126,21 +154,24 @@ public class AntenatalExaminationService {
public AntExChuModel addOneAntEx(AntExChuModel obj) {
obj.setCreated(new Date());
obj.setModified(new Date());
+
return iAntExChuDao.addOneAntEx(obj);
}
- public List queryAntExChu(AntExChuQuery antExChuQuery){
+ public List queryAntExChu(AntExChuQuery antExChuQuery) {
return iAntExChuDao.query(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
}
- public List queryAntExChu(MongoQuery mongoQuery){
+ public List queryAntExChu(MongoQuery mongoQuery) {
return iAntExChuDao.query(mongoQuery);
}
- public List queryYuyueAntenatalExamination(Date yuYueDate,String hospitalId) {
+
+ public List queryYuyueAntenatalExamination(Date yuYueDate, String hospitalId) {
return iAntenatalExaminationDao.queryYuyueAntenatalExamination(yuYueDate, hospitalId);
}
- public List queryYuyueAntenatalExamination(Date startDate,String hospitalId,String pid) {
- return iAntenatalExaminationDao.queryYuyueAntenatalExamination(startDate, hospitalId,pid);
+
+ public List queryYuyueAntenatalExamination(Date startDate, String hospitalId, String pid) {
+ return iAntenatalExaminationDao.queryYuyueAntenatalExamination(startDate, hospitalId, pid);
}
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index cc442b2..27c0ded 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -1,9 +1,6 @@
package com.lyms.platform.biz.service;
-import com.lyms.platform.biz.dal.IPatientDao;
-import com.lyms.platform.biz.dal.IReferralApplyOrderDao;
-import com.lyms.platform.biz.dal.ISieveApplyOrderDao;
-import com.lyms.platform.biz.dal.ISieveDao;
+import com.lyms.platform.biz.dal.*;
import com.lyms.platform.common.dao.operator.MongoQuery;
import com.lyms.platform.common.enums.SieveStatusEnums;
import com.lyms.platform.common.enums.YnEnums;
@@ -37,6 +34,8 @@ public class PatientsService {
private IReferralApplyOrderDao iReferralApplyOrderDao;
@Autowired
private PersonService personService;
+ @Autowired
+ private IAntExRecordDao iAntExRecordDao;
public Patients addPatient(Patients obj) {
return iPatientDao.addPatient(obj);
@@ -241,8 +240,25 @@ public class PatientsService {
//修改转诊
updateRefer(patients);
}
+ //修改产检管理的孕妇基本信息
+ private void updateExRecord(Patients patients){
+ AntExRecordQuery antExRecordQuery=new AntExRecordQuery();
+ antExRecordQuery.setParentId(patients.getId());
+
+ AntExRecordModel antExRecordModel=new AntExRecordModel();
+ antExRecordModel.setLastMenses(patients.getLastMenses());
+ antExRecordModel.setBuildTime(patients.getBookbuildingDate());
+ antExRecordModel.setDueDate(patients.getDueDate());
+ antExRecordModel.setName(patients.getUsername());
+ antExRecordModel.setBrith(patients.getBirth());
+ if(patients.getType()==1){
+ antExRecordModel.setStatus(2);
+ }else {
+ antExRecordModel.setStatus(1);
+ }
-
+ iAntExRecordDao.batchUpdateRecord(antExRecordModel, antExRecordQuery.convertToQuery());
+ }
/**
* 修改产筛数据
*
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index f7e727c..3cba2db 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -145,6 +145,9 @@ public class AntenatalExaminationFacade {
updateLastRhTime(patients.getId(), hospitalId);
//修改最后一次检查时间
setLashCTimes(hospitalId, antExAddRequest.getParentId(), 2);
+
+ //复诊,修改产检管理
+ antenatalExaminationService.updateAntExRecord(antExAddRequest.getParentId(), 2);
} else {
AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
model.setOperator(userId);
@@ -181,6 +184,8 @@ public class AntenatalExaminationFacade {
//修改本院最后一次定义高危
updateLastRhTime(patients.getId(), hospitalId);
+ //复诊,修改产检管理
+ antenatalExaminationService.updateAntExRecord(antExAddRequest.getParentId(),2);
if (null != patients.getBuildType() && patients.getBuildType() == 3) {
ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
referralApplyOrderQuery.setParentId(patients.getId());
@@ -264,6 +269,9 @@ public class AntenatalExaminationFacade {
setLashCTimes(hospitalId, antExChuModel.getParentId(), 1);
+ //初诊,修改产检管理
+ antenatalExaminationService.updateAntExRecord(antExChuModel.getParentId(), 1);
+
} else {
AntExChuQuery antExChuQuery1 = new AntExChuQuery();
antExChuQuery1.setParentId(excAddRequest.getParentId());
@@ -304,6 +312,7 @@ public class AntenatalExaminationFacade {
//修改本院最后一次定义高危
updateLastRhTime(patients.getId(), hospitalId);
setLashCTimes(hospitalId, antExChuModel.getParentId(), 1);
+ antenatalExaminationService.updateAntExRecord(antExChuModel.getParentId(), 1);
if (null != patients.getBuildType() && patients.getBuildType() == 3) {
Patients patients1 = new Patients();
patients1.setEnable("1");