Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!134 体检报告下载优化

Browse Source 
Merge pull request !134 from 德仔/xzj
This commit is contained in:
德仔
2021-03-16 20:12:04 +08:00
committed by Gitee
parent b037802a9c ca9cafc4c7
commit 1445450f53
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
running/pdf/healthyReport.pdf
View File

Binary file not shown.

7
stdiet-custom/src/main/java/com/stdiet/custom/dto/request/HealthyDetailRequest.java
View File

@ -381,14 +381,17 @@ public class HealthyDetailRequest implements Serializable {
private String otherPhysicalSigns; private String otherPhysicalSigns;
/** 气血数据 */ /** 气血数据 */
private String bloodData; private String[] bloodData;
private String bloodDataString;
//备注 //备注
private String remark; private String remark;
/** 湿气数据 */ /** 湿气数据 */
private String moistureDate; private String[] moistureDate;
private String moistureDateString;
/** 减脂指导 **/ /** 减脂指导 **/
private String guidance; private String guidance;

26
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java
View File

@ -180,7 +180,7 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
"secondSmoke","workIndustry","workType","defecationNum","defecationTime","defecationShape", "secondSmoke","workIndustry","workType","defecationNum","defecationTime","defecationShape",
"defecationSmell","defecationSpeed","defecationColor","motionNum","motionDuration","motionTime", "defecationSmell","defecationSpeed","defecationColor","motionNum","motionDuration","motionTime",
"motion","motionField","sleepTime","sleepQuality","sleepDrugFlag","sleepDrug","stayupLateFlag","stayupLateWeekNum", "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" "recoveryeSituation","longEatDrugFlag","longEatDrugClassify","allergyFlag","allergySituation","allergen"
}; };
@ -191,27 +191,19 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
}; };
private Map<String,String> getReportData(SysCustomerHealthy sysCustomerHealthy, HealthyDetailRequest healthyDetailRequest){ private Map<String,String> getReportData(SysCustomerHealthy sysCustomerHealthy, HealthyDetailRequest healthyDetailRequest){
if(StringUtils.isNotEmpty(sysCustomerHealthy.getBloodData())){ if(healthyDetailRequest.getBloodData() != null){
SysDictData param = new SysDictData();
param.setDictType("sys_moisture_data");
param.setDictValueList(Arrays.asList(sysCustomerHealthy.getBloodData().split(",")));
List<SysDictData> bloodData = selectDictDataByTypeAndValue(param);
String bloodString = ""; String bloodString = "";
for (SysDictData blood : bloodData) { for (String value : healthyDetailRequest.getBloodData()) {
bloodString += blood.getDictValue() + "、" +blood.getDictLabel() + "\n"; bloodString += value + "\n";
} }
healthyDetailRequest.setBloodData(bloodString); healthyDetailRequest.setBloodDataString(bloodString);
} }
if(StringUtils.isNotEmpty(sysCustomerHealthy.getMoistureDate())){ if(healthyDetailRequest.getMoistureDate() != null){
SysDictData param = new SysDictData();
param.setDictType("sys_blood_data");
param.setDictValueList(Arrays.asList(sysCustomerHealthy.getBloodData().split(",")));
List<SysDictData> moistureData = selectDictDataByTypeAndValue(param);
String moistureString = ""; String moistureString = "";
for (SysDictData moisture : moistureData) { for (String value : healthyDetailRequest.getMoistureDate()) {
moistureString += moisture.getDictValue() + "、" + moisture.getDictLabel() + "\n"; moistureString += value + "\n";
} }
healthyDetailRequest.setMoistureDate(moistureString); healthyDetailRequest.setMoistureDateString(moistureString);
} }
Map<String,String> data = new HashMap<>(); Map<String,String> data = new HashMap<>();
for (String key : healthyAttrNameAray) { for (String key : healthyAttrNameAray) {