diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index fe8f7d6..91110d1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -32,9 +32,8 @@ import org.springframework.stereotype.Component;
import java.util.*;
/**
- *
* 申请单门面
- *
+ *
* Created by Administrator on 2016/6/15 0015.
*/
@Component
@@ -68,7 +67,7 @@ public class ApplyOrderFacade {
* 增加转诊申请
*
* @param referralApplyOrderAddRequest
- * @param type 2 孕妇 1 儿童
+ * @param type 2 孕妇 1 儿童
* @return
*/
public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId, Integer type) {
@@ -78,12 +77,12 @@ public class ApplyOrderFacade {
PatientsQuery patientsQuery = new PatientsQuery();
patientsQuery.setId(referralApplyOrderModel.getParentId());
- ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
referralApplyOrderQuery.setParentId(referralApplyOrderModel.getParentId());
String hospital = autoMatchFacade.getHospitalId(userId);
referralApplyOrderQuery.setOutHospitalId(hospital);
List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
- if(CollectionUtils.isEmpty(list)){
+ if (CollectionUtils.isEmpty(list)) {
if (2 == type) {
//查询产妇信息
List patientses = patientsService.queryPatient(patientsQuery);
@@ -102,7 +101,8 @@ public class ApplyOrderFacade {
referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
referralApplyOrderModel.setBirth(patients.getBirth());
referralApplyOrderModel.setExpVip(patients.getExpVip());
- int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());;
+ int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
+ ;
referralApplyOrderModel.setPid(patients.getPid());
referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
}
@@ -231,6 +231,16 @@ public class ApplyOrderFacade {
zhuanRname = zhuanc1.getName();
}
referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
+ Map map = new HashMap();
+ if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) {
+ Users users = usersService.getUsers(Integer.valueOf(list.get(0).getApplyDoctor()));
+ if (null != users) {
+ map.put("id", users.getId());
+ map.put("name", users.getName());
+ }
+ }
+ referralApplyOrderResult.setApplyDoctor(map);
+
}
return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
@@ -266,15 +276,15 @@ public class ApplyOrderFacade {
referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo());
referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone());
- String hospital=autoMatchFacade.getHospitalId(userId);
+ String hospital = autoMatchFacade.getHospitalId(userId);
referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
//1 转入 0转出
if ("1".equals(applyOrderQueryRequest.getAction())) {
- referralApplyOrderQuery.setTransferredHospital(hospital);
+ referralApplyOrderQuery.setTransferredHospital(hospital);
} else if ("0".equals(applyOrderQueryRequest.getAction())) {
- referralApplyOrderQuery.setOutHospitalId(hospital);
+ referralApplyOrderQuery.setOutHospitalId(hospital);
}
- if(null!=applyOrderQueryRequest.getTyVip() &&Boolean.TRUE.equals(applyOrderQueryRequest.getTyVip())){
+ if (null != applyOrderQueryRequest.getTyVip() && Boolean.TRUE.equals(applyOrderQueryRequest.getTyVip())) {
referralApplyOrderQuery.setExpVip(1);
}
@@ -298,16 +308,16 @@ public class ApplyOrderFacade {
babyModelQuery.setYn(YnEnums.YES.getId());
List babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);*/
babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname);
- List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid());
- String diagnose = "";
- if (CollectionUtils.isNotEmpty(diagnoseList)) {
- diagnose = "";
- for (String obj : diagnoseList) {
- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj);
- if (basicConfig != null) {
- diagnose += basicConfig.getName() + " ";
- }
- }
+ List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid());
+ String diagnose = "";
+ if (CollectionUtils.isNotEmpty(diagnoseList)) {
+ diagnose = "";
+ for (String obj : diagnoseList) {
+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj);
+ if (basicConfig != null) {
+ diagnose += basicConfig.getName() + " ";
+ }
+ }
babyApplyOrderResult.sethRisk(diagnose);
}
@@ -343,7 +353,7 @@ public class ApplyOrderFacade {
referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
- String hospital=autoMatchFacade.getHospitalId(userId);
+ String hospital = autoMatchFacade.getHospitalId(userId);
referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
//1 转入 0转出
if ("1".equals(applyOrderQueryRequest.getAction())) {
@@ -381,7 +391,7 @@ public class ApplyOrderFacade {
applyOrderResult.setApplyDoctor(users.getName());
}
}
- HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(orderModel.getPid(), true);
+ HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(orderModel.getPid(), true);
applyOrderResult.setrRisk(highScoreResult.gethighRiskStr());
applyOrderResult.setScore(highScoreResult.getScore());
applyOrderResult.setrLevel(highScoreResult.getLevelStr());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
index 73618a4..d95a9cc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
@@ -7,6 +7,7 @@ import com.lyms.platform.pojo.ReferralApplyOrderModel;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by Administrator on 2016/7/7 0007.
@@ -61,7 +62,7 @@ public class ReferralApplyOrderResult {
//转院方式
private String transferMode;
//申请医生
- private String applyDoctor;
+ private java.util.Map applyDoctor;
//转出医院
private String zhuanCName;
//转入医院
@@ -99,11 +100,11 @@ public class ReferralApplyOrderResult {
this.age = age;
}
- public String getApplyDoctor() {
+ public Map getApplyDoctor() {
return applyDoctor;
}
- public void setApplyDoctor(String applyDoctor) {
+ public void setApplyDoctor(Map applyDoctor) {
this.applyDoctor = applyDoctor;
}
@@ -253,7 +254,7 @@ public class ReferralApplyOrderResult {
setTransferredDisease(destModel.getTransferredDisease());
setPotentialRisk(destModel.getPotentialRisk());
setTransferMode(destModel.getTransferMode());
- setApplyDoctor(destModel.getApplyDoctor());
+
setTransferredHospital(destModel.getTransferredHospital());
setZhuanCName(zhuanCName);
setZhuanRname(zhuanRname);