diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index c08ea1c..a3bf351 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -79,6 +79,27 @@ public class SieveApplyOrderModel extends BaseModel { //送检日期 private Date sendTime; + //月经天数 + private Map mensesDay; + //月经周期 + private Map mensesWeek; + + public Map getMensesDay() { + return mensesDay; + } + + public void setMensesDay(Map mensesDay) { + this.mensesDay = mensesDay; + } + + public Map getMensesWeek() { + return mensesWeek; + } + + public void setMensesWeek(Map mensesWeek) { + this.mensesWeek = mensesWeek; + } + public String getSendDoctor() { return sendDoctor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 7483e71..3ae9600 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -26,13 +26,11 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; -import javafx.beans.binding.ObjectExpression; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.domain.Sort; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; @@ -683,6 +681,10 @@ public class SieveFacade { result.put("applyHospitalId",sieveApply.getApplyHospitalId()); result.put("sendDoctor",sieveApply.getSendDoctor()); result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); + result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); + result.put("mensesDay",sieveApply.getMensesDay()); + result.put("mensesWeek",sieveApply.getMensesWeek()); + result.put("experimentNum",""); map.put("sieveApplyInfo",result); @@ -714,6 +716,25 @@ public class SieveFacade { viewInfo.put("applyHospitalName", org.getName()); } } + String isTire = ""; + String tireNumber = ""; + + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); + antExChuQuery1.setParentId(parentId); + antExChuQuery1.setYn(YnEnums.YES.getId()); + List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); + if (CollectionUtils.isNotEmpty(data1)) + { + AntExChuModel chuModel = data1.get(0); + if (StringUtils.isNotEmpty(chuModel.getTireNumber())) + { + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否"; + tireNumber = chuModel.getTireNumber(); + } + } + + map.put("isTire",isTire); + map.put("tireNumber",tireNumber); map.put("viewInfo",viewInfo); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 3603e94..7ed4f1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -78,7 +78,10 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert mensesDay; + //月经周期 + private Map mensesWeek; @Override public SieveApplyOrderModel convertToDataModel() { @@ -103,15 +106,31 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert getMensesDay() { + return mensesDay; + } + + public void setMensesDay(Map mensesDay) { + this.mensesDay = mensesDay; + } + + public Map getMensesWeek() { + return mensesWeek; + } + + public void setMensesWeek(Map mensesWeek) { + this.mensesWeek = mensesWeek; + } + public String getId() { return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index e58b07a..4b4508e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1491,8 +1491,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient public static void main(String[] args) { PatientWeightServiceImpl patientWeightService = new PatientWeightServiceImpl(); - String bmi = patientWeightService.getBmi("65", "168"); - Map map = patientWeightService.getComputeKul(65 , 78.76, 40, Double.parseDouble(bmi),"2"); + String bmi = patientWeightService.getBmi("50", "172"); + Map map = patientWeightService.getComputeKul(50 , 52.13, 16, Double.parseDouble(bmi),"1"); System.out.println(map); // double kulStart = 750;