diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java
index 325cdd6..adc49e9 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java
@@ -90,6 +90,17 @@ public class MedicalRecordVo extends BaseQuery {
// 建档标志
private String patientsType;
+ // 哺乳方式
+ private String feedType;
+
+ public String getFeedType() {
+ return feedType;
+ }
+
+ public void setFeedType(String feedType) {
+ this.feedType = feedType;
+ }
+
public String getPatientsType() {
return patientsType;
}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml
index 2b9d8f7..cd7532e 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml
@@ -186,7 +186,8 @@
mdtrt_tag as mdtrtTag,
height,
weight,
- patients_type as patientsType
+ patients_type as patientsType,
+ feed_type as feedType
FROM medical_record
WHERE 1=1
@@ -288,9 +289,6 @@
NAME = #{name},
-
- patients_type = #{patientsType},
-
PHONE = #{phone},
@@ -340,8 +338,11 @@
BABY_GENDER = #{babyGender},
-
- MATN_HISTORY = #{matnHistory},
+
+ feed_type = #{feedType},
+
+
+ patients_type = #{patientsType},
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicalRecordController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicalRecordController.java
index 30f6aaa..ea7fb5c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicalRecordController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicalRecordController.java
@@ -52,7 +52,7 @@ public class MedicalRecordController extends BaseController {
/**
- * 病案单人信息查询
+ * 产妇建档
*
* @return
*/
@@ -63,4 +63,18 @@ public class MedicalRecordController extends BaseController {
LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
return medicalRecordFacade.saveRecordOne(medicalRecordVo,loginState.getId());
}
+
+
+ /**
+ * 建档修改
+ *
+ * @return
+ */
+ @RequestMapping(method = RequestMethod.POST, value = "/updateRecordOne")
+ @ResponseBody
+ @TokenRequired
+ public BaseResponse updateRecordOne(@Valid @RequestBody MedicalRecordVo medicalRecordVo , HttpServletRequest request) {
+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+ return medicalRecordFacade.updateRecordOne(medicalRecordVo,loginState.getId());
+ }
}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java
index 3c0abe5..d661084 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java
@@ -47,7 +47,14 @@ public class MedicalRecordFacade {
}
for (MedicalRecordVo recordVo : medicalRecordVoList) {
- if("0".equals(recordVo.getPatientsType())){
+ PatientsQuery patientsQuery = new PatientsQuery();
+ patientsQuery.setCardNo(medicalRecordVo.getCardNo());
+ patientsQuery.setPhone(medicalRecordVo.getPhone());
+ patientsQuery.setYn(1);
+ patientsQuery.setDesc("true");
+ patientsQuery.setSort("created");
+ List patientsList = patientsService.queryPatient(patientsQuery);
+ if(CollectionUtils.isNotEmpty(patientsList)){
recordVo.setPatientsType("已建档");
}else{
recordVo.setPatientsType("未建档");
@@ -82,14 +89,12 @@ public class MedicalRecordFacade {
// 查建档
PatientsQuery patientsQuery = new PatientsQuery();
patientsQuery.setCardNo(medicalRecordVo.getCardNo());
- patientsQuery.setPhone(medicalRecordVo.getPhone());
patientsQuery.setYn(1);
- patientsQuery.setType(3);
patientsQuery.setDesc("true");
patientsQuery.setSort("created");
List patientsList = patientsService.queryPatient(patientsQuery);
if(CollectionUtils.isNotEmpty(patientsList)){
- return new BaseResponse().setErrormsg("该手机号已经存在产妇档案,请核实").setErrorcode(ErrorCodeConstants.SUCCESS);
+ return new BaseResponse().setErrormsg("该手机号已经存在档案,请核实").setErrorcode(ErrorCodeConstants.SUCCESS);
}
// 写个人信息
@@ -136,4 +141,43 @@ public class MedicalRecordFacade {
appointmentService.updateMedicalRecord(updateVo);
return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
}
+
+ public BaseResponse updateRecordOne(MedicalRecordVo medicalRecordVo,Integer userId) {
+ // 查建档
+ PatientsQuery patientsQuery = new PatientsQuery();
+ patientsQuery.setCardNo(medicalRecordVo.getCardNo());
+ patientsQuery.setYn(1);
+ patientsQuery.setDesc("true");
+ patientsQuery.setSort("created");
+ List patientsList = patientsService.queryPatient(patientsQuery);
+ if(CollectionUtils.isEmpty(patientsList)){
+ return new BaseResponse().setErrormsg("未查询到档案,请核实").setErrorcode(ErrorCodeConstants.SUCCESS);
+ }
+
+ String id = patientsList.get(0).getId();
+
+ // 更新建档
+ Patients patient=new Patients();
+ patient.setFmHospital("2100002419");
+ patient.setFmDate(DateUtil.parseYMD(medicalRecordVo.getDeliveryTime()));
+ patient.setYn(1);
+ patient.setType(3);
+ patient.setBuildType(2);
+ patient.setOperator(userId);
+ patient.setModified(new Date());
+ patientsService.updatePatientOne(patient,id);
+
+ // 更新诊断
+ MedicalRecordVo updateVo = new MedicalRecordVo();
+ updateVo.setModified(DateUtil.getyyyy_MM_dd_hms(new Date()));
+ updateVo.setCardNo(medicalRecordVo.getCardNo());
+ updateVo.setMdtrtTag(medicalRecordVo.getMdtrtTag());
+ updateVo.setMainDoctor(medicalRecordVo.getMainDoctor());
+ updateVo.setHeight(medicalRecordVo.getHeight());
+ updateVo.setWeight(medicalRecordVo.getWeight());
+ updateVo.setPatientsType("0");
+ updateVo.setFeedType(medicalRecordVo.getFeedType());
+ appointmentService.updateMedicalRecord(updateVo);
+ return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
+ }
}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java
index e946e7a..d5d40c5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java
@@ -49,7 +49,7 @@ public class MatnRehabServiceImpl implements MatnRehabService {
Patients patients = patientsList.get(0);
// 高危风险因素
if(CollectionUtils.isNotEmpty(patients.getRiskFactorId())){
- data.put("rRisk",patients.getRiskFactorId());
+ data.put("riskFactor",patients.getRiskFactorId());
}
// 产后
MedicalRecordVo medicalRecordVo = new MedicalRecordVo();
@@ -60,7 +60,7 @@ public class MatnRehabServiceImpl implements MatnRehabService {
if(CollectionUtils.isNotEmpty(list)) {
MedicalRecordVo medicalRecordVo1 = list.get(0);
data.put("name", medicalRecordVo1.getName());
- data.put("diagnosis", medicalRecordVo1.getMdtrtTag());
+ data.put("mdtrtTag", medicalRecordVo1.getMdtrtTag());
data.put("cardNo", medicalRecordVo1.getCardNo());
String age1 = medicalRecordVo1.getAge().substring(0, 8);
Date date = DateUtil.parseYYYYMMDD(age1);
@@ -70,6 +70,8 @@ public class MatnRehabServiceImpl implements MatnRehabService {
data.put("weight", medicalRecordVo1.getWeight());
data.put("height", medicalRecordVo1.getHeight());
data.put("deliveryDate", medicalRecordVo1.getDeliveryTime());
+ data.put("deliveryMode", medicalRecordVo1.getDeliveryType());
+ data.put("feedType",medicalRecordVo1.getFeedType());
}
// 查询服务是否开通
List patientServices = patientServiceService.getServiceListByParentId(patients.getId(),3);