From 0b36f991b3cafcc43b828bcaa3db1144376b89e3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 27 Oct 2021 11:33:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=8E=BF=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E4=BD=93=E6=88=90=E5=88=86=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/VolumeComponentAnalysisModel.java | 857 +-------------------- .../VolumeComponentAnalysisController.java | 38 +- .../web/facade/VolumeComponentAnalysisFacade.java | 9 + 3 files changed, 40 insertions(+), 864 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java index 794d518..9481875 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java @@ -81,13 +81,6 @@ public class VolumeComponentAnalysisModel extends BaseModel { private String whr;// 0.89;,            //腰臀比（2位小数） @JsonProperty("Edema") private String edema;// 0.33;,           //水肿系数（2位小数） - - @JsonProperty("LA_edema") - private String LA_edema; - - @JsonProperty("LL_edema") - private String LL_edema; - @JsonProperty("VFI") private String vfi;// 12.0;,             //内脏脂肪指数 @JsonProperty("BodyAge") @@ -98,102 +91,22 @@ public class VolumeComponentAnalysisModel extends BaseModel { private String bodyType;// 4;,          //体型判定 @JsonProperty("LBM") private String lbm;// 50.1;,            //瘦体重（去脂体重） - - @JsonProperty("LA_LBM") - private String LA_LBM;// - @JsonProperty("OH") - private String OH;// - - @JsonProperty("RA100") - private String RA100; - @JsonProperty("RA250") - private String RA250; - @JsonProperty("RA5") - private String RA5; - @JsonProperty("RA50") - private String RA50; - @JsonProperty("RA500") - private String RA500; - - - @JsonProperty("RL100") - private String RL100; - @JsonProperty("RL250") - private String RL250; - @JsonProperty("RL5") - private String RL5; - @JsonProperty("RL50") - private String RL50; - @JsonProperty("RL500") - private String RL500; - - @JsonProperty("LA100") - private String LA100; - @JsonProperty("LA250") - private String LA250; - @JsonProperty("LA5") - private String LA5; - @JsonProperty("LA50") - private String LA50; - @JsonProperty("LA500") - private String LA500; - @JsonProperty("ICW") private String icw;// 23.0;,            //细胞内液 - - - @JsonProperty("LL100") - private String LL100; - @JsonProperty("LL250") - private String LL250; - @JsonProperty("LL5") - private String LL5; - @JsonProperty("LL50") - private String LL50; - @JsonProperty("LL500") - private String LL500; - - @JsonProperty("ICWMax") - private String ICWMax;// - - @JsonProperty("ICWMin") - private String ICWMin;// - - @JsonProperty("ECW") private String ecw;// 10.5;,           //细胞外液 - @JsonProperty("StandardWeight") + @JsonProperty("Standard_weight") private String standardWeight;// 70.5;,   //目标体重 - @JsonProperty("WeightControl") + @JsonProperty("Weight_control") private String weightControl;// 2.0;,   //体重控制 - @JsonProperty("FatControl") + @JsonProperty("Fat_control") private String fatControl;// 1.3;,      //脂肪控制量 - @JsonProperty("MuscleControl") + @JsonProperty("Muscle_control") private String muscleControl;// 0.7;,  //肌肉控制量 @JsonProperty("LiverRisk") private String liverRisk;// 65;        //脂肪肝风险系数 @JsonProperty("TR_fat") private String trFat;// 14.5;,        //躯干脂肪量 - - @JsonProperty("LA_ECW") - private String LA_ECW; - @JsonProperty("LA_ICW") - private String LA_ICW; - - - @JsonProperty("TR_ECW") - private String TR_ECW; - @JsonProperty("TR_ICW") - private String TR_ICW; - - @JsonProperty("TR_LBM") - private String TR_LBM; - - @JsonProperty("RL_ECW") - private String RL_ECW; - @JsonProperty("RL_ICW") - private String RL_ICW; - @JsonProperty("LA_fat") private String laFat;// 2.1;,         //左上肢脂肪 @JsonProperty("RA_fat") @@ -293,771 +206,9 @@ public class VolumeComponentAnalysisModel extends BaseModel { private String WaterPercentMax; @JsonProperty("WaterPercentMin") private String WaterPercentMin; - - @JsonProperty("ASMI") - private String ASMI; - @JsonProperty("DW") - private String DW; - @JsonProperty("ECWMax") - private String ECWMax; - @JsonProperty("Doctor") - private String Doctor; - - @JsonProperty("ECWMin") - private String ECWMin; private String image_name; private String message; - - - @JsonProperty("LL_ECW") - private String LL_ECW; - @JsonProperty("LL_ICW") - private String LL_ICW; - @JsonProperty("LL_LBM") - private String LL_LBM; - - @JsonProperty("T100KCH1") - private String T100KCH1; - @JsonProperty("T100KCH2") - private String T100KCH2; - @JsonProperty("T100KCH3") - private String T100KCH3; - @JsonProperty("T100KCH4") - private String T100KCH4; - @JsonProperty("T100KCH5") - private String T100KCH5; - @JsonProperty("T100KCH6") - private String T100KCH6; - @JsonProperty("T250KCH1") - private String T250KCH1; - @JsonProperty("T250KCH2") - private String T250KCH2; - @JsonProperty("T250KCH3") - private String T250KCH3; - @JsonProperty("T250KCH4") - private String T250KCH4; - @JsonProperty("T250KCH5") - private String T250KCH5; - @JsonProperty("T250KCH6") - private String T250KCH6; - @JsonProperty("T500KCH1") - private String T500KCH1; - @JsonProperty("T500KCH2") - private String T500KCH2; - @JsonProperty("T500KCH3") - private String T500KCH3; - @JsonProperty("T500KCH4") - private String T500KCH4; - @JsonProperty("T500KCH5") - private String T500KCH5; - @JsonProperty("T500KCH6") - private String T500KCH6; - @JsonProperty("T50KCH1") - private String T50KCH1; - @JsonProperty("T50KCH2") - private String T50KCH2; - @JsonProperty("T50KCH3") - private String T50KCH3; - @JsonProperty("T50KCH4") - private String T50KCH4; - @JsonProperty("T50KCH5") - private String T50KCH5; - @JsonProperty("T50KCH6") - private String T50KCH6; - @JsonProperty("T5KCH1") - private String T5KCH1; - @JsonProperty("T5KCH2") - private String T5KCH2; - @JsonProperty("T5KCH3") - private String T5KCH3; - @JsonProperty("T5KCH4") - private String T5KCH4; - @JsonProperty("T5KCH5") - private String T5KCH5; - @JsonProperty("T5KCH6") - private String T5KCH6; - @JsonProperty("TR100") - private String TR100; - @JsonProperty("TR250") - private String TR250; - @JsonProperty("TR5") - private String TR5; - @JsonProperty("TR50") - private String TR50; - @JsonProperty("TR500") - private String TR500; - - @JsonProperty("RA_ECW") - private String RA_ECW; - @JsonProperty("RA_ICW") - private String RA_ICW; - @JsonProperty("RA_LBM") - private String RA_LBM; - @JsonProperty("RA_edema") - private String RA_edema; - @JsonProperty("RL_edema") - private String RL_edema; - @JsonProperty("TR_edema") - private String TR_edema; - - - public String getTR_edema() { - return TR_edema; - } - - public void setTR_edema(String TR_edema) { - this.TR_edema = TR_edema; - } - - public String getRL_edema() { - return RL_edema; - } - - public void setRL_edema(String RL_edema) { - this.RL_edema = RL_edema; - } - - public String getRA_edema() { - return RA_edema; - } - - public void setRA_edema(String RA_edema) { - this.RA_edema = RA_edema; - } - - public String getRA_ECW() { - return RA_ECW; - } - - public void setRA_ECW(String RA_ECW) { - this.RA_ECW = RA_ECW; - } - - public String getRA_ICW() { - return RA_ICW; - } - - public void setRA_ICW(String RA_ICW) { - this.RA_ICW = RA_ICW; - } - - public String getRA_LBM() { - return RA_LBM; - } - - public void setRA_LBM(String RA_LBM) { - this.RA_LBM = RA_LBM; - } - - public String getLL_ECW() { - return LL_ECW; - } - - public void setLL_ECW(String LL_ECW) { - this.LL_ECW = LL_ECW; - } - - public String getLL_ICW() { - return LL_ICW; - } - - public void setLL_ICW(String LL_ICW) { - this.LL_ICW = LL_ICW; - } - - public String getLL_LBM() { - return LL_LBM; - } - - public void setLL_LBM(String LL_LBM) { - this.LL_LBM = LL_LBM; - } - - public String getLA100() { - return LA100; - } - - public void setLA100(String LA100) { - this.LA100 = LA100; - } - - public String getLA250() { - return LA250; - } - - public void setLA250(String LA250) { - this.LA250 = LA250; - } - - public String getLA5() { - return LA5; - } - - public void setLA5(String LA5) { - this.LA5 = LA5; - } - - public String getLA50() { - return LA50; - } - - public void setLA50(String LA50) { - this.LA50 = LA50; - } - - public String getLA500() { - return LA500; - } - - public void setLA500(String LA500) { - this.LA500 = LA500; - } - - public String getLL_edema() { - return LL_edema; - } - - public void setLL_edema(String LL_edema) { - this.LL_edema = LL_edema; - } - - public String getTR_LBM() { - return TR_LBM; - } - - public void setTR_LBM(String TR_LBM) { - this.TR_LBM = TR_LBM; - } - - public String getTR_ICW() { - return TR_ICW; - } - - public void setTR_ICW(String TR_ICW) { - this.TR_ICW = TR_ICW; - } - - public String getTR_ECW() { - return TR_ECW; - } - - public void setTR_ECW(String TR_ECW) { - this.TR_ECW = TR_ECW; - } - - public String getLA_edema() { - return LA_edema; - } - - public void setLA_edema(String LA_edema) { - this.LA_edema = LA_edema; - } - - public String getLA_LBM() { - return LA_LBM; - } - - public void setLA_LBM(String LA_LBM) { - this.LA_LBM = LA_LBM; - } - - public String getOH() { - return OH; - } - - public void setOH(String OH) { - this.OH = OH; - } - - public String getRA100() { - return RA100; - } - - public void setRA100(String RA100) { - this.RA100 = RA100; - } - - public String getRA250() { - return RA250; - } - - public void setRA250(String RA250) { - this.RA250 = RA250; - } - - public String getRA5() { - return RA5; - } - - public void setRA5(String RA5) { - this.RA5 = RA5; - } - - public String getRA50() { - return RA50; - } - - public void setRA50(String RA50) { - this.RA50 = RA50; - } - - public String getRA500() { - return RA500; - } - - public void setRA500(String RA500) { - this.RA500 = RA500; - } - - public String getRL100() { - return RL100; - } - - public void setRL100(String RL100) { - this.RL100 = RL100; - } - - public String getRL250() { - return RL250; - } - - public void setRL250(String RL250) { - this.RL250 = RL250; - } - - public String getRL5() { - return RL5; - } - - public void setRL5(String RL5) { - this.RL5 = RL5; - } - - public String getRL50() { - return RL50; - } - - public void setRL50(String RL50) { - this.RL50 = RL50; - } - - public String getRL500() { - return RL500; - } - - public void setRL500(String RL500) { - this.RL500 = RL500; - } - - public String getLL100() { - return LL100; - } - - public void setLL100(String LL100) { - this.LL100 = LL100; - } - - public String getLL250() { - return LL250; - } - - public void setLL250(String LL250) { - this.LL250 = LL250; - } - - public String getLL5() { - return LL5; - } - - public void setLL5(String LL5) { - this.LL5 = LL5; - } - - public String getLL50() { - return LL50; - } - - public void setLL50(String LL50) { - this.LL50 = LL50; - } - - public String getLL500() { - return LL500; - } - - public void setLL500(String LL500) { - this.LL500 = LL500; - } - - public String getICWMax() { - return ICWMax; - } - - public void setICWMax(String ICWMax) { - this.ICWMax = ICWMax; - } - - public String getICWMin() { - return ICWMin; - } - - public void setICWMin(String ICWMin) { - this.ICWMin = ICWMin; - } - - public String getLA_ECW() { - return LA_ECW; - } - - public void setLA_ECW(String LA_ECW) { - this.LA_ECW = LA_ECW; - } - - public String getLA_ICW() { - return LA_ICW; - } - - public void setLA_ICW(String LA_ICW) { - this.LA_ICW = LA_ICW; - } - - public String getRL_ECW() { - return RL_ECW; - } - - public void setRL_ECW(String RL_ECW) { - this.RL_ECW = RL_ECW; - } - - public String getRL_ICW() { - return RL_ICW; - } - - public void setRL_ICW(String RL_ICW) { - this.RL_ICW = RL_ICW; - } - - public String getT100KCH1() { - return T100KCH1; - } - - public void setT100KCH1(String t100KCH1) { - T100KCH1 = t100KCH1; - } - - public String getT100KCH2() { - return T100KCH2; - } - - public void setT100KCH2(String t100KCH2) { - T100KCH2 = t100KCH2; - } - - public String getT100KCH3() { - return T100KCH3; - } - - public void setT100KCH3(String t100KCH3) { - T100KCH3 = t100KCH3; - } - - public String getT100KCH4() { - return T100KCH4; - } - - public void setT100KCH4(String t100KCH4) { - T100KCH4 = t100KCH4; - } - - public String getT100KCH5() { - return T100KCH5; - } - - public void setT100KCH5(String t100KCH5) { - T100KCH5 = t100KCH5; - } - - public String getT100KCH6() { - return T100KCH6; - } - - public void setT100KCH6(String t100KCH6) { - T100KCH6 = t100KCH6; - } - - public String getT250KCH1() { - return T250KCH1; - } - - public void setT250KCH1(String t250KCH1) { - T250KCH1 = t250KCH1; - } - - public String getT250KCH2() { - return T250KCH2; - } - - public void setT250KCH2(String t250KCH2) { - T250KCH2 = t250KCH2; - } - - public String getT250KCH3() { - return T250KCH3; - } - - public void setT250KCH3(String t250KCH3) { - T250KCH3 = t250KCH3; - } - - public String getT250KCH4() { - return T250KCH4; - } - - public void setT250KCH4(String t250KCH4) { - T250KCH4 = t250KCH4; - } - - public String getT250KCH5() { - return T250KCH5; - } - - public void setT250KCH5(String t250KCH5) { - T250KCH5 = t250KCH5; - } - - public String getT250KCH6() { - return T250KCH6; - } - - public void setT250KCH6(String t250KCH6) { - T250KCH6 = t250KCH6; - } - - public String getT500KCH1() { - return T500KCH1; - } - - public void setT500KCH1(String t500KCH1) { - T500KCH1 = t500KCH1; - } - - public String getT500KCH2() { - return T500KCH2; - } - - public void setT500KCH2(String t500KCH2) { - T500KCH2 = t500KCH2; - } - - public String getT500KCH3() { - return T500KCH3; - } - - public void setT500KCH3(String t500KCH3) { - T500KCH3 = t500KCH3; - } - - public String getT500KCH4() { - return T500KCH4; - } - - public void setT500KCH4(String t500KCH4) { - T500KCH4 = t500KCH4; - } - - public String getT500KCH5() { - return T500KCH5; - } - - public void setT500KCH5(String t500KCH5) { - T500KCH5 = t500KCH5; - } - - public String getT500KCH6() { - return T500KCH6; - } - - public void setT500KCH6(String t500KCH6) { - T500KCH6 = t500KCH6; - } - - public String getT50KCH1() { - return T50KCH1; - } - - public void setT50KCH1(String t50KCH1) { - T50KCH1 = t50KCH1; - } - - public String getT50KCH2() { - return T50KCH2; - } - - public void setT50KCH2(String t50KCH2) { - T50KCH2 = t50KCH2; - } - - public String getT50KCH3() { - return T50KCH3; - } - - public void setT50KCH3(String t50KCH3) { - T50KCH3 = t50KCH3; - } - - public String getT50KCH4() { - return T50KCH4; - } - - public void setT50KCH4(String t50KCH4) { - T50KCH4 = t50KCH4; - } - - public String getT50KCH5() { - return T50KCH5; - } - - public void setT50KCH5(String t50KCH5) { - T50KCH5 = t50KCH5; - } - - public String getT50KCH6() { - return T50KCH6; - } - - public void setT50KCH6(String t50KCH6) { - T50KCH6 = t50KCH6; - } - - public String getT5KCH1() { - return T5KCH1; - } - - public void setT5KCH1(String t5KCH1) { - T5KCH1 = t5KCH1; - } - - public String getT5KCH2() { - return T5KCH2; - } - - public void setT5KCH2(String t5KCH2) { - T5KCH2 = t5KCH2; - } - - public String getT5KCH3() { - return T5KCH3; - } - - public void setT5KCH3(String t5KCH3) { - T5KCH3 = t5KCH3; - } - - public String getT5KCH4() { - return T5KCH4; - } - - public void setT5KCH4(String t5KCH4) { - T5KCH4 = t5KCH4; - } - - public String getT5KCH5() { - return T5KCH5; - } - - public void setT5KCH5(String t5KCH5) { - T5KCH5 = t5KCH5; - } - - public String getT5KCH6() { - return T5KCH6; - } - - public void setT5KCH6(String t5KCH6) { - T5KCH6 = t5KCH6; - } - - public String getTR100() { - return TR100; - } - - public void setTR100(String TR100) { - this.TR100 = TR100; - } - - public String getTR250() { - return TR250; - } - - public void setTR250(String TR250) { - this.TR250 = TR250; - } - - public String getTR5() { - return TR5; - } - - public void setTR5(String TR5) { - this.TR5 = TR5; - } - - public String getTR50() { - return TR50; - } - - public void setTR50(String TR50) { - this.TR50 = TR50; - } - - public String getTR500() { - return TR500; - } - - public void setTR500(String TR500) { - this.TR500 = TR500; - } - - public String getECWMin() { - return ECWMin; - } - - public void setECWMin(String ECWMin) { - this.ECWMin = ECWMin; - } - - public String getECWMax() { - return ECWMax; - } - - public void setECWMax(String ECWMax) { - this.ECWMax = ECWMax; - } - - public String getDoctor() { - return Doctor; - } - - public void setDoctor(String doctor) { - Doctor = doctor; - } - - public String getDW() { - return DW; - } - - public void setDW(String DW) { - this.DW = DW; - } - - public String getASMI() { - return ASMI; - } - - public void setASMI(String ASMI) { - this.ASMI = ASMI; - } - public String getArmGrade() { return ArmGrade; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java index d83bf5c..a30a92a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java @@ -51,22 +51,38 @@ public class VolumeComponentAnalysisController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/addComponentAnalysis") @ResponseBody -// public BaseObjectResponse addComponentAnalysis(@RequestBody @Valid VolumeComponentAnalysisModel volume,HttpServletRequest request) { - public BaseObjectResponse addComponentAnalysis(HttpServletRequest request) { - - try { - String json = IOUtils.toString(request.getInputStream()); - System.out.println(json); - } catch (IOException e) { - e.printStackTrace(); - } - VolumeComponentAnalysisModel volume = null; - System.out.println(volume); + public BaseObjectResponse addComponentAnalysis(@RequestBody @Valid VolumeComponentAnalysisModel volume,HttpServletRequest request) { +// public BaseObjectResponse addComponentAnalysis(HttpServletRequest request) { +// +// try { +// String json = IOUtils.toString(request.getInputStream()); +// System.out.println(json); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// VolumeComponentAnalysisModel volume = null; +// System.out.println(volume); + volume.setHospitalId("216"); return volumeComponentAnalysisFacade.addComponentAnalysis(volume); } /** + * 承德县医院 2100001328 + * @param volume + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addComponentAnalysisCdxyy") + @ResponseBody + public BaseObjectResponse addComponentAnalysisCdxyy(@RequestBody @Valid VolumeComponentAnalysisModel volume,HttpServletRequest request) { + volume.setHospitalId("2100001328"); + return volumeComponentAnalysisFacade.addComponentAnalysis(volume); + + } + + + /** * 获取体成分分析记录 */ @RequestMapping(value = "/queryComponentAnalysis", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java index f88c049..7c8c533 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.MongoConvertHelper; import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.operate.web.service.PatientWeightService; @@ -69,6 +70,7 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { patientsQuery.setYn(YnEnums.YES.getId()); List patientses = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isEmpty(patientses)) { + ExceptionUtils.catchException("体成分用户未建档，证件号码:"+volume.getMemberId()); objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); objectResponse.setErrormsg("测量用户还未建档"); return objectResponse; @@ -93,6 +95,13 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { volume.setBeforeWeight(patientWeight.getBeforeWeight()); } } + else + { + ExceptionUtils.catchException("体成分用户没有体重记录，证件号码:"+volume.getMemberId()); + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); + objectResponse.setErrormsg("体成分用户没有体重记录"); + return objectResponse; + } -- 1.8.3.1