diff --git a/running/pdf/healthyReport.pdf b/running/pdf/healthyReport.pdf index c453e40d5..45b6f5daf 100644 Binary files a/running/pdf/healthyReport.pdf and b/running/pdf/healthyReport.pdf differ diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/HealthyDetailRequest.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/HealthyDetailRequest.java index afab4aba9..c1a3c1193 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/HealthyDetailRequest.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/HealthyDetailRequest.java @@ -381,14 +381,17 @@ public class HealthyDetailRequest implements Serializable { private String otherPhysicalSigns; /** 气血数据 */ - private String bloodData; + private String[] bloodData; + + private String bloodDataString; //备注 private String remark; /** 湿气数据 */ - private String moistureDate; + private String[] moistureDate; + private String moistureDateString; /** 减脂指导 **/ private String guidance; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java index 05d21b6d5..aa6b9ae1d 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java @@ -180,7 +180,7 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService "secondSmoke","workIndustry","workType","defecationNum","defecationTime","defecationShape", "defecationSmell","defecationSpeed","defecationColor","motionNum","motionDuration","motionTime", "motion","motionField","sleepTime","sleepQuality","sleepDrugFlag","sleepDrug","stayupLateFlag","stayupLateWeekNum", - "physicalSigns","moistureDate","bloodData","familyIllnessHistory","operationHistory","nearOperationFlag", + "physicalSigns","moistureDateString","bloodDataString","familyIllnessHistory","operationHistory","nearOperationFlag", "recoveryeSituation","longEatDrugFlag","longEatDrugClassify","allergyFlag","allergySituation","allergen" }; @@ -191,27 +191,19 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService }; private Map getReportData(SysCustomerHealthy sysCustomerHealthy, HealthyDetailRequest healthyDetailRequest){ - if(StringUtils.isNotEmpty(sysCustomerHealthy.getBloodData())){ - SysDictData param = new SysDictData(); - param.setDictType("sys_moisture_data"); - param.setDictValueList(Arrays.asList(sysCustomerHealthy.getBloodData().split(","))); - List bloodData = selectDictDataByTypeAndValue(param); + if(healthyDetailRequest.getBloodData() != null){ String bloodString = ""; - for (SysDictData blood : bloodData) { - bloodString += blood.getDictValue() + "、" +blood.getDictLabel() + "\n"; + for (String value : healthyDetailRequest.getBloodData()) { + bloodString += value + "\n"; } - healthyDetailRequest.setBloodData(bloodString); + healthyDetailRequest.setBloodDataString(bloodString); } - if(StringUtils.isNotEmpty(sysCustomerHealthy.getMoistureDate())){ - SysDictData param = new SysDictData(); - param.setDictType("sys_blood_data"); - param.setDictValueList(Arrays.asList(sysCustomerHealthy.getBloodData().split(","))); - List moistureData = selectDictDataByTypeAndValue(param); + if(healthyDetailRequest.getMoistureDate() != null){ String moistureString = ""; - for (SysDictData moisture : moistureData) { - moistureString += moisture.getDictValue() + "、" + moisture.getDictLabel() + "\n"; + for (String value : healthyDetailRequest.getMoistureDate()) { + moistureString += value + "\n"; } - healthyDetailRequest.setMoistureDate(moistureString); + healthyDetailRequest.setMoistureDateString(moistureString); } Map data = new HashMap<>(); for (String key : healthyAttrNameAray) {