Merge branch 'new-ays' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new-ays

acupuncture-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>acupuncture-admin</artifactId>
+    <artifactId>acupuncture-admin-ays</artifactId>
 
     <description>
         web服务入口

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
 import com.acupuncture.common.annotation.Anonymous;
 import com.acupuncture.common.annotation.DataSource;
 import com.acupuncture.common.config.RuoYiConfig;
@@ -191,4 +192,61 @@ public class ExternalController {
     public JsonResponse<UplReportImage> selectReportByMemberId(@RequestBody @Validated ExternalDto.MemberDto dto){
         return JsonResponse.ok(externalService.selectReportByMemberId(dto.getId()));
     }
+
+    @Anonymous
+    @ApiOperation("2人员信息查询接口")
+    @GetMapping("/http/getPersonInfo")
+    @DataSource(DataSourceType.MASTER)
+    public Object getPersonInfo( @RequestParam("uid") String uid) {
+        log.info("获取人员信息:{}", uid);
+        ExternalVo.UserInfo query = externalService.motionQueryMember(uid);
+        if (query == null) {
+            return "no person";
+        }
+        query.setTitle("personInfo");
+        return query;
+    }
+
+    @Anonymous
+    @ApiOperation("3.1体质测试类数据的实时传输")
+    @PostMapping("/http/motionUploadMemberInfo")
+    public Object motionAdd(@RequestBody String str){
+        log.info("str:{}", str);
+        ExternalDto.RtcfInfo rtcfInfo = BeanUtil.copyProperties(new JSONObject(str), ExternalDto.RtcfInfo.class);
+        checkoutData(rtcfInfo.getUUID());
+        log.info("上传运动数据dto123:{}",rtcfInfo);
+        if (externalService.motionAdd(rtcfInfo) == 0) {
+            return "upload fail";
+        }else {
+            return "Fitness data upload ok";
+        }
+    }
+
+    @Anonymous
+    @ApiOperation("3.2体成分数据的上传")
+    @PostMapping("/http/motionUploadMemberTcfInfo")
+    public Object motionAddTcf(@RequestBody String str){
+        log.info("str:{}", str);
+        ExternalDto.BcaData rtcfInfo = BeanUtil.copyProperties(new JSONObject(str), ExternalDto.BcaData.class);
+        checkoutData(rtcfInfo.getUUID());
+        log.info("上传运动数据dto123:{}",rtcfInfo);
+        if (externalService.motionAddTcf(rtcfInfo) == 0) {
+            return "upload fail";
+        }else {
+            return "BCA data upload ok";
+        }
+    }
+
+
+    @ApiOperation("查询运动3.1信息")
+    @PostMapping("/http/queryMotionInfo")
+    public JsonResponse<ExternalVo.RtcfInfo> queryMotionInfo(@RequestBody @Validated ExternalDto.MemberDto dto){
+        return JsonResponse.ok(externalService.queryMotionInfo(dto.getMemberId()));
+    }
+
+    @ApiOperation("查询运动3.2信息")
+    @PostMapping("/http/queryMotionTcfInfo")
+    public JsonResponse<ExternalVo.BcaData> queryMotionTcfInfo(@RequestBody @Validated ExternalDto.MemberDto dto){
+        return JsonResponse.ok(externalService.queryMotionTcfInfo(dto.getMemberId()));
+    }
 }

acupuncture-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/acupuncture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/acupuncture_ays?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: q7510327
             # 从库数据源

acupuncture-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.0.192:3306/acupuncture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.0.192:3306/acupuncture_ays?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 username: root
                 password: csylcx18aA
             # 从库数据源
@@ -66,7 +66,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 0
+        database: 1
         # 密码
         password: 123456
         # 连接超时时间
@@ -82,12 +82,12 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
 file:
-    PatientTemplate: /home/acupuncture/server/profile/PatientTemplate.xlsx
-    TreamentTemplate: /home/acupuncture/server/profile/TreamentTemplate.xlsx
-    wxQrCodeTemplate: /home/acupuncture/server/profile/wxQrCodeTemplate.docx
-    screenQrCodeTemplate: /home/acupuncture/server/profile/screenQrCodeTemplate.docx
-    hbTemplate: /home/acupuncture/server/profile/screenHbQrCodeTemplate.docx
+    PatientTemplate: /home/acupuncture_ays/server/profile/PatientTemplate.xlsx
+    TreamentTemplate: /home/acupuncture_ays/server/profile/TreamentTemplate.xlsx
+    wxQrCodeTemplate: /home/acupuncture_ays/server/profile/wxQrCodeTemplate.docx
+    screenQrCodeTemplate: /home/acupuncture_ays/server/profile/screenQrCodeTemplate.docx
+    hbTemplate: /home/acupuncture_ays/server/profile/screenHbQrCodeTemplate.docx
     screenPath: http://test.tall.wiki/acupuncture/web-admin/screening/H5?hospitalId=hosId&hospitalName=hosName&centerId=cId
-    pgTemplate: /home/acupuncture/server/profile/TreamtmentPgTemplate.docx
-    jmrsUrl: /home/acupuncture/server/profile/uploads/jmrsTemplate.docx
+    pgTemplate: /home/acupuncture_ays/server/profile/TreamtmentPgTemplate.docx
+    jmrsUrl: /home/acupuncture_ays/server/profile/uploads/jmrsTemplate.docx
 

acupuncture-admin/src/main/resources/application-stage.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://sd.tall.wiki:3306/acupuncture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://sd.tall.wiki:3306/acupuncture_ays?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: po3OynBO[M3579p6L7)o
             # 从库数据源

acupuncture-admin/src/main/resources/application.yml

@@ -17,7 +17,7 @@ acupuncture:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 20001
+  port: 20002
   servlet:
     # 应用的访问路径
     context-path: /
@@ -78,7 +78,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 1
     # 密码
     password:
     # 连接超时时间
@@ -101,7 +101,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 1800
+  expireTime: 18000
 
 # MyBatis配置
 mybatis:

acupuncture-generator/src/main/resources/mbg.xml

@@ -20,7 +20,7 @@
         </commentGenerator>
 
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://sd.tall.wiki:3306/acupuncture?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=GMT%2B8&amp;tinyInt1isBit=false"
+                        connectionURL="jdbc:mysql://sd.tall.wiki:3306/acupuncture_ays?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=GMT%2B8&amp;tinyInt1isBit=false"
                         userId="root"
                         password="po3OynBO[M3579p6L7)o">
             <!--仅仅查询当前库的表，不查询其他库-->
@@ -80,7 +80,7 @@
 <!--        <table tableName="fms_followup_queue" domainObjectName="FmsFollowupQueue" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fms_followup_task" domainObjectName="FmsFollowupTask" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fms_patient_queue_relation" domainObjectName="FmsPatientQueueRelation" enableDeleteByExample="false"/>-->
-<!--        <table tableName="pms_patient" domainObjectName="PmsPatient" enableDeleteByExample="false"/>-->
+        <table tableName="pms_patient" domainObjectName="PmsPatient" enableDeleteByExample="false"/>
         <table tableName="pms_treatment" domainObjectName="PmsTreatment" enableDeleteByExample="false"/>
 <!--        <table tableName="pms_treatment_record" domainObjectName="PmsTreatmentRecord" enableDeleteByExample="false"/>-->
 <!--        <table tableName="rms_report_type" domainObjectName="RmsReportType" enableDeleteByExample="false"/>-->

acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ExternalDto.java

@@ -2,8 +2,10 @@ package com.acupuncture.system.domain.dto;
 
 import com.acupuncture.system.domain.po.UplReportImage;
 import com.acupuncture.system.domain.po.UplRtcfInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -215,4 +217,933 @@ public class ExternalDto {
         private String from;
         private String memberid;
     }
+
+
+    /**
+     * 3.1体质测试类数据的实时传输
+     */
+    public static class RtcfInfo {
+        @ApiModelProperty("当前测得体质测试类数据标题")
+        @JsonProperty("Title")
+        private String Title;
+        @ApiModelProperty("单位代码（或科室代码、项目代码）")
+        @JsonProperty("UUID")
+        private String UUID;
+        @ApiModelProperty("人员编号")
+        @JsonProperty("UID")
+        @NotNull(message = "人员编号不能为空")
+        private String UID;
+        @ApiModelProperty("测试序号（时间戳）")
+        @JsonProperty("TestID")
+        private String TestID;
+        @ApiModelProperty("测试日期")
+        @JsonProperty("TestDate")
+        @NotNull(message = "测试日期不能为空")
+        private String TestDate;
+        @ApiModelProperty("测试者姓名")
+        @JsonProperty("Name")
+        private String Name;
+        @ApiModelProperty("测试者性别，男1女2")
+        @JsonProperty("Sex")
+        private String Sex;
+        @ApiModelProperty("测试者出生年份")
+        @JsonProperty("BirthYear")
+        @JsonFormat(pattern = "yyyy")
+        private String BirthYear;
+
+        private List<Detail> data;
+        private Advice advice;
+
+        //体测结果数据*
+
+        public String getTitle() {
+            return Title;
+        }
+
+        public void setTitle(String title) {
+            Title = title;
+        }
+        @JsonProperty("")
+        public String getUUID() {
+            return UUID;
+        }
+
+        public void setUUID(String UUID) {
+            this.UUID = UUID;
+        }
+        @JsonProperty("")
+        public String getUID() {
+            return UID;
+        }
+
+        public void setUID(String UID) {
+            this.UID = UID;
+        }
+        @JsonProperty("")
+        public String getTestID() {
+            return TestID;
+        }
+
+        public void setTestID(String testID) {
+            TestID = testID;
+        }
+        @JsonProperty("")
+        public String getTestDate() {
+            return TestDate;
+        }
+
+        public void setTestDate(String testDate) {
+            TestDate = testDate;
+        }
+
+        public String getName() {
+            return Name;
+        }
+
+        public void setName(String name) {
+            Name = name;
+        }
+
+        public String getSex() {
+            return Sex;
+        }
+
+        public void setSex(String sex) {
+            Sex = sex;
+        }
+        @JsonFormat(pattern = "yyyy")
+        public String getBirthYear() {
+            return BirthYear;
+        }
+        @JsonFormat(pattern = "yyyy")
+        public void setBirthYear(String birthYear) {
+            BirthYear = birthYear;
+        }
+
+        public List<Detail> getData() {
+            return data;
+        }
+
+        public void setData(List<Detail> data) {
+            this.data = data;
+        }
+
+        public Advice getAdvice() {
+            return advice;
+        }
+
+        public void setAdvice(Advice advice) {
+            this.advice = advice;
+        }
+
+        public static class Detail {
+            private String TestID;
+            @JsonProperty("Item")
+            private String Item;
+            @JsonProperty("Value")
+            private String Value;
+            @JsonProperty("Score")
+            private String Score;
+
+            @JsonProperty("Item")
+            public String getItem() {
+                return Item;
+            }
+
+            public void setItem(String item) {
+                Item = item;
+            }
+
+            @JsonProperty("Value")
+            public String getValue() {
+                return Value;
+            }
+
+            public void setValue(String value) {
+                Value = value;
+            }
+
+            @JsonProperty("Score")
+            public String getScore() {
+                return Score;
+            }
+
+            public void setScore(String score) {
+                Score = score;
+            }
+
+            public String getTestID() {
+                return TestID;
+            }
+
+            public void setTestID(String testID) {
+                TestID = testID;
+            }
+        }
+
+        public static class Advice {
+            @JsonProperty("SportPrinciple")
+            private String SportPrinciple;     //运动原则
+            @JsonProperty("Aerobic")
+            private String Aerobic;     //有氧运动内容
+            @JsonProperty("Strength")
+            private String Strength;   //力量运动内容
+            @JsonProperty("Flexibility")
+            private String Flexibility;    //柔韧运动内容
+            @JsonProperty("FunctionExcercise")
+            private String FunctionExcercise;  //功能性练习内容
+            @JsonProperty("Caution")
+            private String Caution;    //注意事项
+            private String TestID;
+            @JsonProperty("SportPrinciple")
+            public String getSportPrinciple() {
+                return SportPrinciple;
+            }
+
+            public void setSportPrinciple(String sportPrinciple) {
+                SportPrinciple = sportPrinciple;
+            }
+
+            @JsonProperty("Aerobic")
+            public String getAerobic() {
+                return Aerobic;
+            }
+
+            public void setAerobic(String aerobic) {
+                Aerobic = aerobic;
+            }
+
+            @JsonProperty("Strength")
+            public String getStrength() {
+                return Strength;
+            }
+
+            public void setStrength(String strength) {
+                Strength = strength;
+            }
+
+            @JsonProperty("Flexibility")
+            public String getFlexibility() {
+                return Flexibility;
+            }
+
+            public void setFlexibility(String flexibility) {
+                Flexibility = flexibility;
+            }
+
+            @JsonProperty("FunctionExcercise")
+            public String getFunctionExcercise() {
+                return FunctionExcercise;
+            }
+
+            public void setFunctionExcercise(String functionExcercise) {
+                FunctionExcercise = functionExcercise;
+            }
+
+            @JsonProperty("Caution")
+            public String getCaution() {
+                return Caution;
+            }
+
+            public void setCaution(String caution) {
+                Caution = caution;
+            }
+
+            public String getTestID() {
+                return TestID;
+            }
+
+            public void setTestID(String testID) {
+                TestID = testID;
+            }
+        }
+    }
+
+    public static class BcaData {
+        @ApiModelProperty("当前测得体质测试类数据标题")
+        @JsonProperty("Title")
+        private String Title;
+        @ApiModelProperty("单位代码（或科室代码、项目代码）")
+        @JsonProperty("UUID")
+        private String UUID;
+        @ApiModelProperty("人员编号")
+        @JsonProperty("UID")
+        private String UID;
+        @ApiModelProperty("测试序号（时间戳）")
+        @JsonProperty("TestID")
+        private String TestID;
+        @ApiModelProperty("测试日期")
+        @JsonProperty("TestDate")
+        private String TestDate;
+        @ApiModelProperty("测试者姓名")
+        @JsonProperty("Name")
+        private String Name;
+        @ApiModelProperty("测试者性别，男1女2")
+        @JsonProperty("Sex")
+        private String Sex;
+        private Data data;
+        private Advice advice;
+
+        public String getTitle() {
+            return Title;
+        }
+
+        public void setTitle(String title) {
+            Title = title;
+        }
+
+        public String getUUID() {
+            return UUID;
+        }
+
+        public void setUUID(String UUID) {
+            this.UUID = UUID;
+        }
+
+        public String getUID() {
+            return UID;
+        }
+
+        public void setUID(String UID) {
+            this.UID = UID;
+        }
+
+        public String getTestID() {
+            return TestID;
+        }
+
+        public void setTestID(String testID) {
+            TestID = testID;
+        }
+
+        public String getTestDate() {
+            return TestDate;
+        }
+
+        public void setTestDate(String testDate) {
+            TestDate = testDate;
+        }
+
+        public String getName() {
+            return Name;
+        }
+
+        public void setName(String name) {
+            Name = name;
+        }
+
+        public String getSex() {
+            return Sex;
+        }
+
+        public void setSex(String sex) {
+            Sex = sex;
+        }
+
+        public Data getData() {
+            return data;
+        }
+
+        public void setData(Data data) {
+            this.data = data;
+        }
+
+        public Advice getAdvice() {
+            return advice;
+        }
+
+        public void setAdvice(Advice advice) {
+            this.advice = advice;
+        }
+
+        public static class Data {
+            @JsonProperty("TestID")
+            private String TestID;
+            @JsonProperty("UID")
+            private  String UID;
+            @JsonProperty("UUID")
+            private String UUID;
+            @JsonProperty("Name")
+            private String Name;
+            @JsonProperty("TestDate")
+            private String TestDate;
+            @JsonProperty("Sex")
+            private String Sex;
+            @JsonProperty("Weight")
+            private String Weight;      //体重
+            @JsonProperty("Fat")
+            private String Fat;         //脂肪
+            @JsonProperty("Bone")
+            private String Bone;          //骨质
+            @JsonProperty("Protein")
+            private String Protein;        //蛋白质
+            @JsonProperty("Water")
+            private String Water;           //水分
+            @JsonProperty("Muscle")
+            private String Muscle;        //肌肉
+            @JsonProperty("SMM")
+            private String SMM;       //骨骼肌
+            @JsonProperty("PBF")
+            private String PBF;       //体脂百分比
+            @JsonProperty("BMI")
+            private String BMI;      //体质指数
+            @JsonProperty("BMR")
+            private String BMR;   //基础代谢
+            @JsonProperty("Edema")
+            private String Edema;     //水肿系数（2位小数）
+            @JsonProperty("VFI")
+            private String VFI;    //内脏脂肪指数
+            @JsonProperty("BodyAge")
+            private String BodyAge;       //身体年龄
+            @JsonProperty("Score")
+            private String Score;       //健康评分
+            @JsonProperty("BodyType")
+            private String BodyType;        //体型判定
+            @JsonProperty("Standard_weight")
+            private String Standard_weight;  //目标体重
+            @JsonProperty("Weight_control")
+            private String Weight_control; //体重控制
+            @JsonProperty("Fat_control")
+            private String Fat_control; //脂肪控制量
+            @JsonProperty("Muscle_control")
+            private String Muscle_control;//肌肉控制量
+            @JsonProperty("ASMI")
+            private String ASMI;   //四肢骨骼肌指数
+            @JsonProperty("WeightMax")
+            private String WeightMax;  //体重正常范围的高值
+            @JsonProperty("WeightMin")
+            private String WeightMin;  //体重正常范围的低值
+            @JsonProperty("FatMax")
+            private String FatMax;//体重正常范围的高值
+            @JsonProperty("FatMin")
+            private String FatMin;   //体重正常范围的低值
+            @JsonProperty("BoneMax")
+            private String BoneMax; //骨质正常范围的高值
+            @JsonProperty("BoneMin")
+            private String BoneMin; //骨质正常范围的低值
+            @JsonProperty("ProteinMax")
+            private String ProteinMax;  //蛋白质正常范围的高值
+            @JsonProperty("ProteinMin")
+            private String ProteinMin;  //蛋白质正常范围的低值
+            @JsonProperty("WaterMax")
+            private String WaterMax;//水分正常范围的高值
+            @JsonProperty("WaterMin")
+            private String WaterMin; //水分正常范围的低值
+            @JsonProperty("MuscleMax")
+            private String MuscleMax;   //肌肉正常范围的高值
+            @JsonProperty("MuscleMin")
+            private String MuscleMin;   //肌肉正常范围的低值
+            @JsonProperty("SMMMax")
+            private String SMMMax;//骨骼肌正常范围的高值
+            @JsonProperty("SMMMin")
+            private String SMMMin;//骨骼肌正常范围的低值
+            @JsonProperty("PBFMax")
+            private String PBFMax; //体脂率正常范围的高值
+            @JsonProperty("PBFMin")
+            private String PBFMin; //体脂率正常范围的低值
+            @JsonProperty("BMIMax")
+            private String BMIMax; //体质指数正常范围的高值
+            @JsonProperty("BMIMin")
+            private String BMIMin; //体质指数正常范围的低值
+            @JsonProperty("WHRMax")
+            private String WHRMax;//腰臀比正常范围的高值
+            @JsonProperty("WHRMin")
+            private String WHRMin;//腰臀比正常范围的低值
+            @JsonProperty("EdemaMax")
+            private String EdemaMax; //水肿系数正常范围的高值
+            @JsonProperty("EdemaMin")
+            private String EdemaMin;  //水肿系数正常范围的低值
+            @JsonProperty("VFIMax")
+            private String VFIMax; //内脏脂肪指数正常范围的高值
+            @JsonProperty("VFIMin")
+            private String VFIMin;  //内脏脂肪指数正常范围的低值
+            @JsonProperty("Diagnosis")
+            private String Diagnosis;           //诊断结论(UTF-8编码)
+
+            public String getTestID() {
+                return TestID;
+            }
+
+            public void setTestID(String testID) {
+                TestID = testID;
+            }
+
+            public String getUID() {
+                return UID;
+            }
+
+            public void setUID(String UID) {
+                this.UID = UID;
+            }
+
+            public String getUUID() {
+                return UUID;
+            }
+
+            public void setUUID(String UUID) {
+                this.UUID = UUID;
+            }
+
+            public String getName() {
+                return Name;
+            }
+
+            public void setName(String name) {
+                Name = name;
+            }
+
+            public String getTestDate() {
+                return TestDate;
+            }
+
+            public void setTestDate(String testDate) {
+                TestDate = testDate;
+            }
+
+            public String getSex() {
+                return Sex;
+            }
+
+            public void setSex(String sex) {
+                Sex = sex;
+            }
+
+            public String getWeight() {
+                return Weight;
+            }
+
+            public void setWeight(String weight) {
+                Weight = weight;
+            }
+
+            public String getFat() {
+                return Fat;
+            }
+
+            public void setFat(String fat) {
+                Fat = fat;
+            }
+
+            public String getBone() {
+                return Bone;
+            }
+
+            public void setBone(String bone) {
+                Bone = bone;
+            }
+
+            public String getProtein() {
+                return Protein;
+            }
+
+            public void setProtein(String protein) {
+                Protein = protein;
+            }
+
+            public String getWater() {
+                return Water;
+            }
+
+            public void setWater(String waterx) {
+                Water = waterx;
+            }
+
+            public String getMuscle() {
+                return Muscle;
+            }
+
+            public void setMuscle(String muscle) {
+                Muscle = muscle;
+            }
+
+            public String getSMM() {
+                return SMM;
+            }
+
+            public void setSMM(String SMM) {
+                this.SMM = SMM;
+            }
+
+            public String getPBF() {
+                return PBF;
+            }
+
+            public void setPBF(String PBF) {
+                this.PBF = PBF;
+            }
+
+            public String getBMI() {
+                return BMI;
+            }
+
+            public void setBMI(String BMI) {
+                this.BMI = BMI;
+            }
+
+            public String getBMR() {
+                return BMR;
+            }
+
+            public void setBMR(String BMR) {
+                this.BMR = BMR;
+            }
+
+            public String getEdema() {
+                return Edema;
+            }
+
+            public void setEdema(String edema) {
+                Edema = edema;
+            }
+
+            public String getVFI() {
+                return VFI;
+            }
+
+            public void setVFI(String VFI) {
+                this.VFI = VFI;
+            }
+
+            public String getBodyAge() {
+                return BodyAge;
+            }
+
+            public void setBodyAge(String bodyAge) {
+                BodyAge = bodyAge;
+            }
+
+            public String getScore() {
+                return Score;
+            }
+
+            public void setScore(String score) {
+                Score = score;
+            }
+
+            public String getBodyType() {
+                return BodyType;
+            }
+
+            public void setBodyType(String bodyType) {
+                BodyType = bodyType;
+            }
+
+            public String getStandard_weight() {
+                return Standard_weight;
+            }
+
+            public void setStandard_weight(String standard_weight) {
+                Standard_weight = standard_weight;
+            }
+
+            public String getWeight_control() {
+                return Weight_control;
+            }
+
+            public void setWeight_control(String weight_control) {
+                Weight_control = weight_control;
+            }
+
+            public String getFat_control() {
+                return Fat_control;
+            }
+
+            public void setFat_control(String fat_control) {
+                Fat_control = fat_control;
+            }
+
+            public String getMuscle_control() {
+                return Muscle_control;
+            }
+
+            public void setMuscle_control(String muscle_control) {
+                Muscle_control = muscle_control;
+            }
+
+            public String getASMI() {
+                return ASMI;
+            }
+
+            public void setASMI(String ASMI) {
+                this.ASMI = ASMI;
+            }
+
+            public String getWeightMax() {
+                return WeightMax;
+            }
+
+            public void setWeightMax(String weightMax) {
+                WeightMax = weightMax;
+            }
+
+            public String getWeightMin() {
+                return WeightMin;
+            }
+
+            public void setWeightMin(String weightMin) {
+                WeightMin = weightMin;
+            }
+
+            public String getFatMax() {
+                return FatMax;
+            }
+
+            public void setFatMax(String fatMax) {
+                FatMax = fatMax;
+            }
+
+            public String getFatMin() {
+                return FatMin;
+            }
+
+            public void setFatMin(String fatMin) {
+                FatMin = fatMin;
+            }
+
+            public String getBoneMax() {
+                return BoneMax;
+            }
+
+            public void setBoneMax(String boneMax) {
+                BoneMax = boneMax;
+            }
+
+            public String getBoneMin() {
+                return BoneMin;
+            }
+
+            public void setBoneMin(String boneMin) {
+                BoneMin = boneMin;
+            }
+
+            public String getProteinMax() {
+                return ProteinMax;
+            }
+
+            public void setProteinMax(String proteinMax) {
+                ProteinMax = proteinMax;
+            }
+
+            public String getProteinMin() {
+                return ProteinMin;
+            }
+
+            public void setProteinMin(String proteinMin) {
+                ProteinMin = proteinMin;
+            }
+
+            public String getWaterMax() {
+                return WaterMax;
+            }
+
+            public void setWaterMax(String waterMax) {
+                WaterMax = waterMax;
+            }
+
+            public String getWaterMin() {
+                return WaterMin;
+            }
+
+            public void setWaterMin(String waterMin) {
+                WaterMin = waterMin;
+            }
+
+            public String getMuscleMax() {
+                return MuscleMax;
+            }
+
+            public void setMuscleMax(String muscleMax) {
+                MuscleMax = muscleMax;
+            }
+
+            public String getMuscleMin() {
+                return MuscleMin;
+            }
+
+            public void setMuscleMin(String muscleMin) {
+                MuscleMin = muscleMin;
+            }
+
+            public String getSMMMax() {
+                return SMMMax;
+            }
+
+            public void setSMMMax(String SMMMax) {
+                this.SMMMax = SMMMax;
+            }
+
+            public String getSMMMin() {
+                return SMMMin;
+            }
+
+            public void setSMMMin(String SMMMin) {
+                this.SMMMin = SMMMin;
+            }
+
+            public String getPBFMax() {
+                return PBFMax;
+            }
+
+            public void setPBFMax(String PBFMax) {
+                this.PBFMax = PBFMax;
+            }
+
+            public String getPBFMin() {
+                return PBFMin;
+            }
+
+            public void setPBFMin(String PBFMin) {
+                this.PBFMin = PBFMin;
+            }
+
+            public String getBMIMax() {
+                return BMIMax;
+            }
+
+            public void setBMIMax(String BMIMax) {
+                this.BMIMax = BMIMax;
+            }
+
+            public String getBMIMin() {
+                return BMIMin;
+            }
+
+            public void setBMIMin(String BMIMin) {
+                this.BMIMin = BMIMin;
+            }
+
+            public String getWHRMax() {
+                return WHRMax;
+            }
+
+            public void setWHRMax(String WHRMax) {
+                this.WHRMax = WHRMax;
+            }
+
+            public String getWHRMin() {
+                return WHRMin;
+            }
+
+            public void setWHRMin(String WHRMin) {
+                this.WHRMin = WHRMin;
+            }
+
+            public String getEdemaMax() {
+                return EdemaMax;
+            }
+
+            public void setEdemaMax(String edemaMax) {
+                EdemaMax = edemaMax;
+            }
+
+            public String getEdemaMin() {
+                return EdemaMin;
+            }
+
+            public void setEdemaMin(String edemaMin) {
+                EdemaMin = edemaMin;
+            }
+
+            public String getVFIMax() {
+                return VFIMax;
+            }
+
+            public void setVFIMax(String VFIMax) {
+                this.VFIMax = VFIMax;
+            }
+
+            public String getVFIMin() {
+                return VFIMin;
+            }
+
+            public void setVFIMin(String VFIMin) {
+                this.VFIMin = VFIMin;
+            }
+
+            public String getDiagnosis() {
+                return Diagnosis;
+            }
+
+            public void setDiagnosis(String diagnosis) {
+                Diagnosis = diagnosis;
+            }
+        }
+
+
+        public static class Advice {
+            @JsonProperty("TestID")
+            private String TestID;
+            private String PersonType;  //*人员类型
+            private String DailyEnergy;  //日能量需求（单位：kcal）
+            private String DietPrinciple;  //膳食原则
+            private String StandardBreakfast; //示范食谱-早餐（使用\n换行，下同)
+            private String StandardLunch;   //示范食谱-午餐
+            private String StandardDinner; //示范食谱-晚餐
+            private String StandardNutrition; //示范食谱-营养素
+
+            public String getTestID() {
+                return TestID;
+            }
+
+            public void setTestID(String testID) {
+                TestID = testID;
+            }
+
+            public String getPersonType() {
+                return PersonType;
+            }
+
+            public void setPersonType(String personType) {
+                PersonType = personType;
+            }
+
+            public String getDailyEnergy() {
+                return DailyEnergy;
+            }
+
+            public void setDailyEnergy(String dailyEnergy) {
+                DailyEnergy = dailyEnergy;
+            }
+
+            public String getDietPrinciple() {
+                return DietPrinciple;
+            }
+
+            public void setDietPrinciple(String dietPrinciple) {
+                DietPrinciple = dietPrinciple;
+            }
+
+            public String getStandardBreakfast() {
+                return StandardBreakfast;
+            }
+
+            public void setStandardBreakfast(String standardBreakfast) {
+                StandardBreakfast = standardBreakfast;
+            }
+
+            public String getStandardLunch() {
+                return StandardLunch;
+            }
+
+            public void setStandardLunch(String standardLunch) {
+                StandardLunch = standardLunch;
+            }
+
+            public String getStandardDinner() {
+                return StandardDinner;
+            }
+
+            public void setStandardDinner(String standardDinner) {
+                StandardDinner = standardDinner;
+            }
+
+            public String getStandardNutrition() {
+                return StandardNutrition;
+            }
+
+            public void setStandardNutrition(String standardNutrition) {
+                StandardNutrition = standardNutrition;
+            }
+        }
+    }
 }

acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java

@@ -37,6 +37,9 @@ public class PmsPatientDto {
         @ApiModelProperty("建档人")
         private String createBy;
         private String phone;
+        private String weight;
+
+        private Integer height;
     }
 
     @Data
@@ -60,6 +63,10 @@ public class PmsPatientDto {
 
         private Byte source;
 
+        private String weight;
+
+        private Integer height;
+
         private List<String> currentIllnessHistory;
         private String currentIllnessHistoryQt;
         public String getCurrentIllnessHistory() {
@@ -91,7 +98,9 @@ public class PmsPatientDto {
         private String idCard;
 
         private Byte source;
+        private String weight;
 
+        private Integer height;
         private List<String> currentIllnessHistory;
         private String currentIllnessHistoryQt;
         public String getCurrentIllnessHistory() {

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java

@@ -30,7 +30,9 @@ public class PmsPatient implements Serializable {
 
     private String currentIllnessHistory;
 
-    private String currentIllnessHistoryQt;
+    private String height;
+
+    private String weight;
 
     private Byte delFlag;
 
@@ -46,6 +48,8 @@ public class PmsPatient implements Serializable {
 
     private String remark;
 
+    private String currentIllnessHistoryQt;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -152,12 +156,20 @@ public class PmsPatient implements Serializable {
         this.currentIllnessHistory = currentIllnessHistory == null ? null : currentIllnessHistory.trim();
     }
 
-    public String getCurrentIllnessHistoryQt() {
-        return currentIllnessHistoryQt;
+    public String getHeight() {
+        return height;
     }
 
-    public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) {
-        this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim();
+    public void setHeight(String height) {
+        this.height = height == null ? null : height.trim();
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight == null ? null : weight.trim();
     }
 
     public Byte getDelFlag() {
@@ -216,6 +228,14 @@ public class PmsPatient implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getCurrentIllnessHistoryQt() {
+        return currentIllnessHistoryQt;
+    }
+
+    public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) {
+        this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -235,7 +255,8 @@ public class PmsPatient implements Serializable {
         sb.append(", idCard=").append(idCard);
         sb.append(", source=").append(source);
         sb.append(", currentIllnessHistory=").append(currentIllnessHistory);
-        sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt);
+        sb.append(", height=").append(height);
+        sb.append(", weight=").append(weight);
         sb.append(", delFlag=").append(delFlag);
         sb.append(", tenantId=").append(tenantId);
         sb.append(", createBy=").append(createBy);
@@ -243,6 +264,7 @@ public class PmsPatient implements Serializable {
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", remark=").append(remark);
+        sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt);
         sb.append("]");
         return sb.toString();
     }

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java

@@ -982,73 +982,143 @@ public class PmsPatientExample {
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIsNull() {
-            addCriterion("current_illness_history_qt is null");
+        public Criteria andHeightIsNull() {
+            addCriterion("height is null");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIsNotNull() {
-            addCriterion("current_illness_history_qt is not null");
+        public Criteria andHeightIsNotNull() {
+            addCriterion("height is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtEqualTo(String value) {
-            addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt");
+        public Criteria andHeightEqualTo(String value) {
+            addCriterion("height =", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) {
-            addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt");
+        public Criteria andHeightNotEqualTo(String value) {
+            addCriterion("height <>", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) {
-            addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt");
+        public Criteria andHeightGreaterThan(String value) {
+            addCriterion("height >", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) {
-            addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt");
+        public Criteria andHeightGreaterThanOrEqualTo(String value) {
+            addCriterion("height >=", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLessThan(String value) {
-            addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt");
+        public Criteria andHeightLessThan(String value) {
+            addCriterion("height <", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) {
-            addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt");
+        public Criteria andHeightLessThanOrEqualTo(String value) {
+            addCriterion("height <=", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLike(String value) {
-            addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt");
+        public Criteria andHeightLike(String value) {
+            addCriterion("height like", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotLike(String value) {
-            addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt");
+        public Criteria andHeightNotLike(String value) {
+            addCriterion("height not like", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIn(List<String> values) {
-            addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt");
+        public Criteria andHeightIn(List<String> values) {
+            addCriterion("height in", values, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotIn(List<String> values) {
-            addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt");
+        public Criteria andHeightNotIn(List<String> values) {
+            addCriterion("height not in", values, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) {
-            addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt");
+        public Criteria andHeightBetween(String value1, String value2) {
+            addCriterion("height between", value1, value2, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) {
-            addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt");
+        public Criteria andHeightNotBetween(String value1, String value2) {
+            addCriterion("height not between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNull() {
+            addCriterion("weight is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNotNull() {
+            addCriterion("weight is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEqualTo(String value) {
+            addCriterion("weight =", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotEqualTo(String value) {
+            addCriterion("weight <>", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThan(String value) {
+            addCriterion("weight >", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThanOrEqualTo(String value) {
+            addCriterion("weight >=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThan(String value) {
+            addCriterion("weight <", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThanOrEqualTo(String value) {
+            addCriterion("weight <=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLike(String value) {
+            addCriterion("weight like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotLike(String value) {
+            addCriterion("weight not like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIn(List<String> values) {
+            addCriterion("weight in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotIn(List<String> values) {
+            addCriterion("weight not in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightBetween(String value1, String value2) {
+            addCriterion("weight between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotBetween(String value1, String value2) {
+            addCriterion("weight not between", value1, value2, "weight");
             return (Criteria) this;
         }
 
@@ -1501,6 +1571,76 @@ public class PmsPatientExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andCurrentIllnessHistoryQtIsNull() {
+            addCriterion("current_illness_history_qt is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtIsNotNull() {
+            addCriterion("current_illness_history_qt is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtEqualTo(String value) {
+            addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) {
+            addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) {
+            addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) {
+            addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtLessThan(String value) {
+            addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) {
+            addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtLike(String value) {
+            addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotLike(String value) {
+            addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtIn(List<String> values) {
+            addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotIn(List<String> values) {
+            addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) {
+            addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) {
+            addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatment.java

@@ -50,6 +50,10 @@ public class PmsTreatment implements Serializable {
 
     private Long memberId;
 
+    private Integer height;
+
+    private String weight;
+
     private Byte delFlag;
 
     private Long tenantId;
@@ -250,6 +254,22 @@ public class PmsTreatment implements Serializable {
         this.memberId = memberId;
     }
 
+    public Integer getHeight() {
+        return height;
+    }
+
+    public void setHeight(Integer height) {
+        this.height = height;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight == null ? null : weight.trim();
+    }
+
     public Byte getDelFlag() {
         return delFlag;
     }
@@ -335,6 +355,8 @@ public class PmsTreatment implements Serializable {
         sb.append(", diagnosisName=").append(diagnosisName);
         sb.append(", status=").append(status);
         sb.append(", memberId=").append(memberId);
+        sb.append(", height=").append(height);
+        sb.append(", weight=").append(weight);
         sb.append(", delFlag=").append(delFlag);
         sb.append(", tenantId=").append(tenantId);
         sb.append(", createBy=").append(createBy);

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatmentExample.java

@@ -1622,6 +1622,136 @@ public class PmsTreatmentExample {
             return (Criteria) this;
         }
 
+        public Criteria andHeightIsNull() {
+            addCriterion("height is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIsNotNull() {
+            addCriterion("height is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightEqualTo(Integer value) {
+            addCriterion("height =", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotEqualTo(Integer value) {
+            addCriterion("height <>", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThan(Integer value) {
+            addCriterion("height >", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThanOrEqualTo(Integer value) {
+            addCriterion("height >=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThan(Integer value) {
+            addCriterion("height <", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThanOrEqualTo(Integer value) {
+            addCriterion("height <=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIn(List<Integer> values) {
+            addCriterion("height in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotIn(List<Integer> values) {
+            addCriterion("height not in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightBetween(Integer value1, Integer value2) {
+            addCriterion("height between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotBetween(Integer value1, Integer value2) {
+            addCriterion("height not between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNull() {
+            addCriterion("weight is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNotNull() {
+            addCriterion("weight is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEqualTo(String value) {
+            addCriterion("weight =", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotEqualTo(String value) {
+            addCriterion("weight <>", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThan(String value) {
+            addCriterion("weight >", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThanOrEqualTo(String value) {
+            addCriterion("weight >=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThan(String value) {
+            addCriterion("weight <", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThanOrEqualTo(String value) {
+            addCriterion("weight <=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLike(String value) {
+            addCriterion("weight like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotLike(String value) {
+            addCriterion("weight not like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIn(List<String> values) {
+            addCriterion("weight in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotIn(List<String> values) {
+            addCriterion("weight not in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightBetween(String value1, String value2) {
+            addCriterion("weight between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotBetween(String value1, String value2) {
+            addCriterion("weight not between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
         public Criteria andDelFlagIsNull() {
             addCriterion("del_flag is null");
             return (Criteria) this;

acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java

@@ -42,6 +42,8 @@ public class PmsPatientVo {
         @ApiModelProperty("现病史，存储格式：[\"高血压\",\"脑血管病\"]")
         private String currentIllnessHistory;
         private String currentIllnessHistoryQt;
+        private String weight;
+        private String height;
         @ApiModelProperty("建档组织（当前登录账号医院ID）")
         private Long tenantId;
         @ApiModelProperty("创建者")

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java

@@ -5,6 +5,7 @@ import com.acupuncture.system.domain.vo.DmsLoginUserVo;
 import com.acupuncture.system.domain.vo.ExternalVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,4 +19,70 @@ public interface ExternalDao {
     List<ExternalVo.Result> select(@Param("query") ExternalDto.Query query);
 
     List<ExternalVo.Result> selectByMemberId(@Param("query") ExternalDto.Query query);
+
+    /**
+     * 运动功能测评获取人员信息
+     * @param memberid 门诊号/住院号
+     * @return
+     */
+    ExternalVo.UserInfo motionQueryMember(@Param("memberid") String memberid);
+
+    int motionAdd(@Param("rtcfInfoDto") ExternalDto.RtcfInfo rtcfInfoDto);
+
+    /**
+     * 查询是否已有主测试记录
+     */
+    List<ExternalVo.UserInfo> motionQueryMemberInfo(@Param("memberid") String memberid,
+                                              @Param("testData")Date testData,
+                                              @Param("Title") String Title);
+
+    /**
+     * 体质测试类数据的实时传输 体测结果数据
+     * @param dto
+     * @return
+     */
+    int motionAddDetail(@Param("list") List<ExternalDto.RtcfInfo.Detail> dto);
+
+    int motionAddAdvice(@Param("dto") ExternalDto.RtcfInfo.Advice dto);
+
+
+    /**
+     * 3.2 添加体成分数据
+     * @param dto
+     * @return
+     */
+    int motionAddTcf(@Param("dto") ExternalDto.BcaData.Data dto);
+
+    int motionAddTcfMain(@Param("dto") ExternalDto.BcaData dto);
+
+    int motionAddTcfAdvice(@Param("dto") ExternalDto.BcaData.Advice dto);
+
+    int delMain(@Param("uId") String uId,
+                @Param("Title") String Title);
+
+    int delData(@Param("TestID") String TestID);
+
+    int delAdvice(@Param("TestID") String TestID);
+
+    int delRecord(@Param("TestID") String TestID);
+
+    int delBcaAdvice(@Param("TestID") String TestID);
+
+    //前台同步查询运动数据
+
+    ExternalVo.RtcfInfo queryMotionInfo(@Param("memberid")String memberid,
+                                        @Param("Title") String Title);
+
+    List<ExternalVo.RtcfInfo.Detail> queryMotionDetail(@Param("TestID")String TestID);
+
+    ExternalVo.RtcfInfo.Advice queryMotionAdvice(@Param("TestID")String TestID);
+
+
+    ExternalVo.BcaData queryMotionTcfInfo(@Param("memberid")String memberid,
+                                          @Param("Title") String Title);
+
+    ExternalVo.BcaData.Data queryMotionTcfData(@Param("TestID")String TestID);
+
+    ExternalVo.BcaData.Advice queryMotionTcfAdvice(@Param("TestID")String TestID);
+
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/ExternalService.java

@@ -54,4 +54,28 @@ public interface ExternalService {
      */
     UplReportImage selectReportByMemberId(Long id);
 
+
+    /**
+     * 运动功能测评获取人员信息
+     * @param memberid 门诊号/住院号
+     * @return
+     */
+    ExternalVo.UserInfo motionQueryMember(String memberid);
+
+    /**
+     * 上传数据
+     * @return
+     */
+    int motionAdd(ExternalDto.RtcfInfo rtcfInfoDto);
+
+    /**
+     * 上传数据
+     * @return
+     */
+    int motionAddTcf(ExternalDto.BcaData bcaData);
+
+
+    ExternalVo.RtcfInfo queryMotionInfo(String memberid);
+
+    ExternalVo.BcaData queryMotionTcfInfo(String memberid);
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java

@@ -2,6 +2,7 @@ package com.acupuncture.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.acupuncture.common.core.redis.RedisCache;
@@ -15,6 +16,8 @@ import com.acupuncture.system.persist.mapper.UplReportImageMapper;
 import com.acupuncture.system.persist.mapper.UplRtcfInfoMapper;
 import com.acupuncture.system.service.ExternalService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -27,6 +30,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class ExternalServiceImpl implements ExternalService {
 
     @Resource
@@ -220,4 +224,86 @@ public class ExternalServiceImpl implements ExternalService {
         }
         return new UplReportImage();
     }
+
+    @Override
+    public ExternalVo.UserInfo motionQueryMember(String memberid) {
+        return externalDao.motionQueryMember(memberid);
+    }
+
+    @Override
+    public int motionAdd(ExternalDto.RtcfInfo rtcfInfoDto) {
+        //查询今日是否已有测试数据， 如有则删除后新增
+        List<ExternalVo.UserInfo> userInfos = externalDao.motionQueryMemberInfo(rtcfInfoDto.getUID(), DateUtil.parse(rtcfInfoDto.getTestDate(), "yyyy-MM-dd"), rtcfInfoDto.getTitle());
+        if (CollectionUtil.isNotEmpty(userInfos)) {
+            //删除数据
+            for (ExternalVo.UserInfo userInfo : userInfos) {
+                externalDao.delMain(userInfo.getUID(), "CURRENT_FIT_DATA");
+                externalDao.delData(userInfo.getTestID());
+                externalDao.delAdvice(userInfo.getTestID());
+            }
+        }
+
+        ExternalDto.RtcfInfo.Advice advice = rtcfInfoDto.getAdvice();
+        List<ExternalDto.RtcfInfo.Detail> data = rtcfInfoDto.getData();
+        if (advice != null) {
+            advice.setTestID(rtcfInfoDto.getTestID());
+            externalDao.motionAddAdvice(advice);
+        }
+        if (CollectionUtil.isNotEmpty(data)) {
+            for (ExternalDto.RtcfInfo.Detail datum : data) {
+                datum.setTestID(rtcfInfoDto.getTestID());
+            }
+            externalDao.motionAddDetail(data);
+        }
+        return externalDao.motionAdd(rtcfInfoDto);
+    }
+
+    @Override
+    public int motionAddTcf(ExternalDto.BcaData bcaData) {
+        //查询今日是否已有测试数据， 如有则删除后新增
+        List<ExternalVo.UserInfo> userInfos = externalDao.motionQueryMemberInfo(bcaData.getUID(), DateUtil.parse(bcaData.getTestDate(), "yyyy-MM-dd"), bcaData.getTitle());
+        if (CollectionUtil.isNotEmpty(userInfos)) {
+            //删除数据
+            for (ExternalVo.UserInfo userInfo : userInfos) {
+                externalDao.delMain(userInfo.getUID(), "CURRENT_BCA_DATA");
+                externalDao.delRecord(userInfo.getUID());
+                externalDao.delBcaAdvice(userInfo.getUID());
+            }
+        }
+
+        if (bcaData.getData() != null) {
+            bcaData.getData().setName(bcaData.getName());
+            bcaData.getData().setTestID(bcaData.getTestID());
+            bcaData.getData().setUUID(bcaData.getUUID());
+            bcaData.getData().setSex(bcaData.getSex());
+            bcaData.getData().setUID(bcaData.getUID());
+            bcaData.getData().setTestDate(bcaData.getTestDate());
+            externalDao.motionAddTcf(bcaData.getData());
+        }
+        if (bcaData.getAdvice() != null) {
+            bcaData.getAdvice().setTestID(bcaData.getTestID());
+            externalDao.motionAddTcfAdvice(bcaData.getAdvice());
+        }
+        return externalDao.motionAddTcfMain(bcaData);
+    }
+
+    @Override
+    public ExternalVo.RtcfInfo queryMotionInfo(String memberid) {
+        ExternalVo.RtcfInfo currentFitData = externalDao.queryMotionInfo(memberid, "CURRENT_FIT_DATA");
+        if (currentFitData != null) {
+            currentFitData.setData(externalDao.queryMotionDetail(currentFitData.getTestID()));
+            currentFitData.setAdvice(externalDao.queryMotionAdvice(currentFitData.getTestID()));
+        }
+        return currentFitData;
+    }
+
+    @Override
+    public ExternalVo.BcaData queryMotionTcfInfo(String memberid) {
+        ExternalVo.BcaData bcaData = externalDao.queryMotionTcfInfo(memberid, "CURRENT_BCA_DATA");
+        if (bcaData != null) {
+            bcaData.setData(externalDao.queryMotionTcfData(bcaData.getTestID()));
+            bcaData.setAdvice(externalDao.queryMotionTcfAdvice(bcaData.getTestID()));
+        }
+        return bcaData;
+    }
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java

@@ -6,9 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.IdcardUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.*;
 import cn.hutool.extra.pinyin.PinyinUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
@@ -42,6 +40,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
@@ -83,7 +82,8 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
     private String profilePath;
     @Value("${acupuncture.profileUrl}")
     private String profileUrl;
-
+    //诊疗档案编码默认生成规则
+    private static final String MEMBER_ID_PREFIX = "UID";
 
     @Override
     public void addTreatment(PmsTreatmentDto.TreatmentAdd dto) {
@@ -150,22 +150,39 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
         }
     }
 
+    /**
+     * 用户编号递增，保证所有库中用户编号唯一
+     * 将每天生成的用户编号存到redis
+     * 如有则+1，放入缓存
+     * 没有则创建第一条，放入缓存
+     * @return
+     */
     @Override
     @Synchronized
     public Long getMemberId() {
         //编码生成规则： 年+月+日+每天该租户的最大编码+1
         //生成最小的编码
         Date now = new Date();
-        String date = DateUtil.format(now, "yyMMdd") + "0000";
-        Long minMemberId = Long.parseLong(date);
-        PmsTreatmentExample pmsTreatmentExample = new PmsTreatmentExample();
-        pmsTreatmentExample.createCriteria().andDelFlagEqualTo((byte) 0).andTenantIdEqualTo(SecurityUtils.getTenantId()).andMemberIdGreaterThan(minMemberId);
-        pmsTreatmentExample.setOrderByClause("create_time desc");
-        List<PmsTreatment> pmsTreatments = treatmentMapper.selectByExample(pmsTreatmentExample);
-        if (CollectionUtil.isEmpty(pmsTreatments)) {
-            return minMemberId + 1;
-        }
-        return pmsTreatments.get(0).getMemberId() + 1;
+        String date = DateUtil.format(now, "yyMMdd");
+        Long minMemberId = Long.parseLong(date + "0000");
+
+        Object o = redisCache.get(MEMBER_ID_PREFIX + "_" + date);
+        if (ObjectUtil.isEmpty(o)) {
+            redisCache.set(MEMBER_ID_PREFIX + "_" + date, minMemberId + 1);
+            return minMemberId;
+        }else {
+            long l = NumberUtil.add(o.toString(), "1").longValue();
+            redisCache.set(MEMBER_ID_PREFIX + "_" + date, l);
+            return l;
+        }
+//        PmsTreatmentExample pmsTreatmentExample = new PmsTreatmentExample();
+//        pmsTreatmentExample.createCriteria().andDelFlagEqualTo((byte) 0).andTenantIdEqualTo(SecurityUtils.getTenantId()).andMemberIdGreaterThan(minMemberId);
+//        pmsTreatmentExample.setOrderByClause("create_time desc");
+//        List<PmsTreatment> pmsTreatments = treatmentMapper.selectByExample(pmsTreatmentExample);
+//        if (CollectionUtil.isEmpty(pmsTreatments)) {
+//            return minMemberId + 1;
+//        }
+//        return pmsTreatments.get(0).getMemberId() + 1;
     }
 
     @Override

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java

@@ -477,6 +477,13 @@ public class ScreeningServiceImpl implements IScreeningService {
                 if (ObjectUtil.isNotNull(map.get("SCWJ-XBS-QT"))) {
                     pmsPatient.setCurrentIllnessHistory(map.get("SCWJ-XBS-QT").getAnswer());
                 }
+                if (ObjectUtil.isNotNull(map.get("SCWJ-HEIGHT"))) {
+                    pmsPatient.setHeight(map.get("SCWJ-HEIGHT").getAnswer());
+                }
+                if (ObjectUtil.isNotNull(map.get("SCWJ-WEIGHT"))) {
+                    pmsPatient.setWeight(map.get("SCWJ-WEIGHT").getAnswer());
+                }
+
                 pmsPatient.setSource((byte) 0);
                 pmsPatient.setDelFlag((byte) 0);
                 pmsPatient.setCreateTime(new Date());

acupuncture-system/src/main/resources/mapper/dao/ExternalDao.xml

@@ -49,4 +49,390 @@
         </where>
     </select>
 
+    <select id="motionQueryMember" resultType="com.acupuncture.system.domain.vo.ExternalVo$UserInfo">
+        select
+        t.member_id as UID,
+        t.name as Name,
+        t.gender as Sex,
+        t.birth_date as BirthYear,
+        t.phone as Phone,
+        t.tenant_id as GID
+        from
+        v_pms_treatment t
+        <where>
+            t.del_flag = 0
+            <if test="memberid != null and memberid != ''">
+               and t.member_id = #{memberid}
+            </if>
+        </where>
+    </select>
+
+    <insert id="motionAdd" parameterType="com.acupuncture.system.domain.dto.ExternalDto$RtcfInfo">
+        insert into
+            fit_test_main
+        (
+            TestID,
+            Title,
+            UUID,
+            UID,
+            TestDate,
+            Name,
+            Sex,
+            BirthYear
+        )
+        values
+        (
+            #{rtcfInfoDto.TestID},
+            #{rtcfInfoDto.title},
+            #{rtcfInfoDto.UUID},
+            #{rtcfInfoDto.UID},
+            #{rtcfInfoDto.testDate},
+            #{rtcfInfoDto.Name},
+            #{rtcfInfoDto.Sex},
+            #{rtcfInfoDto.BirthYear}
+        )
+    </insert>
+
+    <select id="motionQueryMemberInfo" resultType="com.acupuncture.system.domain.vo.ExternalVo$UserInfo">
+        select
+        t.UID as UID,
+        t.Name as Name,
+        TestID as TestID
+        from
+        fit_test_main t
+        <where>
+            <if test="memberid != null and memberid != ''">
+                and t.UID = #{memberid}
+            </if>
+<!--            <if test="testData != null">-->
+<!--                and t.TestDate = #{testData}-->
+<!--            </if>-->
+            <if test="Title != null">
+                and t.Title = #{Title}
+            </if>
+        </where>
+    </select>
+
+    <insert id="motionAddDetail" parameterType="java.util.List">
+        INSERT INTO fit_test_data (TestID, ItemCode, TestValue, Score)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.TestID}, #{item.Item}, #{item.Value}, #{item.Score})
+        </foreach>
+    </insert>
+
+    <insert id="motionAddAdvice" parameterType="com.acupuncture.system.domain.dto.ExternalDto$RtcfInfo$Advice">
+        insert into
+        fit_test_advice
+        (
+        TestID,
+        SportPrinciple,
+        Aerobic,
+        Strength,
+        Flexibility,
+        FunctionExcercise,
+        Caution
+        )
+        values
+        (
+            #{dto.TestID},
+            #{dto.SportPrinciple},
+            #{dto.Aerobic},
+            #{dto.Strength},
+            #{dto.Flexibility},
+            #{dto.FunctionExcercise},
+            #{dto.Caution}
+        )
+    </insert>
+
+    <insert id="motionAddTcf" parameterType="com.acupuncture.system.domain.dto.ExternalDto$BcaData$Data">
+        insert into fit_test_records
+        (
+         TestID,
+         UUID,
+         UID,
+         TestDate,
+         Name,
+         Sex,
+         Weight,
+         Fat,
+         Bone,
+         Protein,
+         Water,
+         Muscle,
+         SMM,
+         PBF,
+         BMI,
+         BMR,
+         Edema,
+         VFI,
+         BodyAge,
+         Score,
+         BodyType,
+         Standard_weight,
+         Weight_control,
+         Fat_control,
+         Muscle_control,
+         ASMI,
+         WeightMax,
+         WeightMin,
+         FatMax,
+         FatMin,
+         BoneMax,
+         BoneMin,
+         ProteinMax,
+         ProteinMin,
+         WaterMax,
+         WaterMin,
+         MuscleMax,
+         MuscleMin,
+         SMMMax,
+         SMMMin,
+         PBFMax,
+         PBFMin,
+         BMIMax,
+         BMIMin,
+         WHRMax,
+         WHRMin,
+         EdemaMax,
+         EdemaMin,
+         VFIMax,
+         VFIMin,
+         Diagnosis)
+        values (
+                #{dto.TestID},
+                #{dto.UUID},
+                #{dto.UID},
+                #{dto.TestDate},
+                #{dto.Name},
+                #{dto.Sex},
+                #{dto.Weight},
+                #{dto.Fat},
+                #{dto.Bone},
+                #{dto.Protein},
+                #{dto.Water},
+                #{dto.Muscle},
+                #{dto.SMM},
+                #{dto.PBF},
+                #{dto.BMI},
+                #{dto.BMR},
+                #{dto.Edema},
+                #{dto.VFI},
+                #{dto.BodyAge},
+                #{dto.Score},
+                #{dto.BodyType},
+                #{dto.Standard_weight},
+                #{dto.Weight_control},
+                #{dto.Fat_control},
+                #{dto.Muscle_control},
+                #{dto.ASMI},
+                #{dto.WeightMax},
+                #{dto.WeightMin},
+                #{dto.FatMax},
+                #{dto.FatMin},
+                #{dto.BoneMax},
+                #{dto.BoneMin},
+                #{dto.ProteinMax},
+                #{dto.ProteinMin},
+                #{dto.WaterMax},
+                #{dto.WaterMin},
+                #{dto.MuscleMax},
+                #{dto.MuscleMin},
+                #{dto.SMMMax},
+                #{dto.SMMMin},
+                #{dto.PBFMax},
+                #{dto.PBFMin},
+                #{dto.BMIMax},
+                #{dto.BMIMin},
+                #{dto.WHRMax},
+                #{dto.WHRMin},
+                #{dto.EdemaMax},
+                #{dto.EdemaMin},
+                #{dto.VFIMax},
+                #{dto.VFIMin},
+                #{dto.Diagnosis}
+                )
+    </insert>
+
+    <insert id="motionAddTcfMain" parameterType="com.acupuncture.system.domain.dto.ExternalDto$RtcfInfo">
+        insert into
+            fit_test_main
+        (
+            TestID,
+            Title,
+            UUID,
+            UID,
+            TestDate,
+            Name,
+            Sex
+        )
+        values
+            (
+                #{dto.TestID},
+                #{dto.title},
+                #{dto.UUID},
+                #{dto.UID},
+                #{dto.testDate},
+                #{dto.Name},
+                #{dto.Sex}
+            )
+    </insert>
+
+    <insert id="motionAddTcfAdvice" parameterType="com.acupuncture.system.domain.dto.ExternalDto$BcaData$Advice">
+        insert into fit_bca_advice(TestID,
+                                   PersonType,
+                                   DailyEnergy,
+                                   DietPrinciple,
+                                   StandardBreakfast,
+                                   StandardLunch,
+                                   StandardDinner,
+                                   StandardNutrition)
+        values ( #{dto.TestID},
+                #{dto.PersonType},
+                #{dto.DailyEnergy},
+                #{dto.DietPrinciple},
+                #{dto.StandardBreakfast},
+                #{dto.StandardLunch},
+                #{dto.StandardDinner},
+                #{dto.StandardNutrition})
+    </insert>
+
+    <delete id="delMain" >
+        delete from fit_test_main where UID = #{uId} and Title = #{Title}
+    </delete>
+    
+    <delete id="delAdvice">
+        delete from fit_test_advice where TestID = #{TestID}
+    </delete>
+    
+    <delete id="delData">
+        delete from fit_test_data where TestID = #{TestID}
+    </delete>
+
+    <delete id="delRecord">
+        delete from fit_test_records where TestID = #{TestID}
+    </delete>
+
+    <delete id="delBcaAdvice">
+        delete from fit_bca_advice where TestID = #{TestID}
+    </delete>
+
+    <select id="queryMotionInfo" resultType="com.acupuncture.system.domain.vo.ExternalVo$RtcfInfo">
+        select TestID,
+               UID,
+               TestDate,
+               Name,
+               Sex,
+               UUID
+        from fit_test_main
+        where UID = #{memberid}
+          and Title = #{Title}
+        order by TestDate desc limit 1
+    </select>
+
+    <select id="queryMotionDetail" resultType="com.acupuncture.system.domain.vo.ExternalVo$RtcfInfo$Detail">
+        select TestID,
+               ItemCode as Item,
+               TestValue as Value,
+               Score
+        from fit_test_data
+        where TestID = #{TestID}
+    </select>
+
+    <select id="queryMotionAdvice" resultType="com.acupuncture.system.domain.vo.ExternalVo$RtcfInfo$Advice">
+        select TestID,
+               PersonType,
+               DailyEnergy,
+               DietPrinciple,
+               StandardBreakfast,
+               StandardLunch,
+               StandardDinner,
+               StandardNutrition
+        from fit_bca_advice
+        where TestID = #{TestID}
+    </select>
+
+    <select id="queryMotionTcfInfo" resultType="com.acupuncture.system.domain.vo.ExternalVo$BcaData">
+        select TestID,
+               UID,
+               TestDate,
+               Name,
+               Sex,
+               UUID
+        from fit_test_main
+        where UID = #{memberid}
+          and Title = #{Title}
+        order by TestDate desc limit 1
+    </select>
+
+    <select id="queryMotionTcfData" resultType="com.acupuncture.system.domain.vo.ExternalVo$BcaData$Data">
+        select
+            TestID,
+            UUID,
+            UID,
+            TestDate,
+            Name,
+            Sex,
+            Weight,
+            Fat,
+            Bone,
+            Protein,
+            Water,
+            Muscle,
+            SMM,
+            PBF,
+            BMI,
+            BMR,
+            Edema,
+            VFI,
+            BodyAge,
+            Score,
+            BodyType,
+            Standard_weight,
+            Weight_control,
+            Fat_control,
+            Muscle_control,
+            ASMI,
+            WeightMax,
+            WeightMin,
+            FatMax,
+            FatMin,
+            BoneMax,
+            BoneMin,
+            ProteinMax,
+            ProteinMin,
+            WaterMax,
+            WaterMin,
+            MuscleMax,
+            MuscleMin,
+            SMMMax,
+            SMMMin,
+            PBFMax,
+            PBFMin,
+            BMIMax,
+            BMIMin,
+            WHRMax,
+            WHRMin,
+            EdemaMax,
+            EdemaMin,
+            VFIMax,
+            VFIMin,
+            Diagnosis
+        from fit_test_records
+        where TestID = #{TestID}
+    </select>
+
+    <select id="queryMotionTcfAdvice" resultType="com.acupuncture.system.domain.vo.ExternalVo$BcaData$Advice">
+        select TestID,
+               PersonType,
+               DailyEnergy,
+               DietPrinciple,
+               StandardBreakfast,
+               StandardLunch,
+               StandardDinner,
+               StandardNutrition
+        from fit_bca_advice
+        where TestID = #{TestID}
+    </select>
+
 </mapper>

acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml

@@ -21,7 +21,9 @@
         p.tenant_id as tenantId,
         p.create_by as createBy,
         p.create_time as createTime,
-        t.name as tenantName
+        t.name as tenantName,
+        p. weight,
+        p.height
         FROM
         pms_patient p
         left join
@@ -62,7 +64,7 @@
             </if>
         </where>
         group by p.id
-        order by p.create_time desc
+        order by p.update_time desc
     </select>
 
     <select id="adminQuery" resultType="com.acupuncture.system.domain.vo.PmsPatientVo$PatientResult"

acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml

@@ -15,7 +15,8 @@
     <result column="id_card" jdbcType="VARCHAR" property="idCard" />
     <result column="source" jdbcType="TINYINT" property="source" />
     <result column="current_illness_history" jdbcType="VARCHAR" property="currentIllnessHistory" />
-    <result column="current_illness_history_qt" jdbcType="VARCHAR" property="currentIllnessHistoryQt" />
+    <result column="height" jdbcType="VARCHAR" property="height" />
+    <result column="weight" jdbcType="VARCHAR" property="weight" />
     <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -23,6 +24,7 @@
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="current_illness_history_qt" jdbcType="VARCHAR" property="currentIllnessHistoryQt" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -84,8 +86,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, name, pinyin_full, pinyin_simple, gender, birth_date, ethnicity, education_years, 
-    phone, id_card_type, id_card, source, current_illness_history, current_illness_history_qt, 
-    del_flag, tenant_id, create_by, create_time, update_by, update_time, remark
+    phone, id_card_type, id_card, source, current_illness_history, height, weight, del_flag, 
+    tenant_id, create_by, create_time, update_by, update_time, remark, current_illness_history_qt
   </sql>
   <select id="selectByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultMap="BaseResultMap">
     select
@@ -116,18 +118,18 @@
       pinyin_simple, gender, birth_date, 
       ethnicity, education_years, phone, 
       id_card_type, id_card, source, 
-      current_illness_history, current_illness_history_qt, 
+      current_illness_history, height, weight, 
       del_flag, tenant_id, create_by, 
       create_time, update_by, update_time, 
-      remark)
+      remark, current_illness_history_qt)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pinyinFull,jdbcType=VARCHAR}, 
       #{pinyinSimple,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, #{birthDate,jdbcType=DATE}, 
       #{ethnicity,jdbcType=VARCHAR}, #{educationYears,jdbcType=INTEGER}, #{phone,jdbcType=VARCHAR}, 
       #{idCardType,jdbcType=TINYINT}, #{idCard,jdbcType=VARCHAR}, #{source,jdbcType=TINYINT}, 
-      #{currentIllnessHistory,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR}, 
+      #{currentIllnessHistory,jdbcType=VARCHAR}, #{height,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR}, 
       #{delFlag,jdbcType=TINYINT}, #{tenantId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{remark,jdbcType=VARCHAR})
+      #{remark,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.PmsPatient">
     insert into pms_patient
@@ -171,8 +173,11 @@
       <if test="currentIllnessHistory != null">
         current_illness_history,
       </if>
-      <if test="currentIllnessHistoryQt != null">
-        current_illness_history_qt,
+      <if test="height != null">
+        height,
+      </if>
+      <if test="weight != null">
+        weight,
       </if>
       <if test="delFlag != null">
         del_flag,
@@ -195,6 +200,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="currentIllnessHistoryQt != null">
+        current_illness_history_qt,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -236,8 +244,11 @@
       <if test="currentIllnessHistory != null">
         #{currentIllnessHistory,jdbcType=VARCHAR},
       </if>
-      <if test="currentIllnessHistoryQt != null">
-        #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      <if test="height != null">
+        #{height,jdbcType=VARCHAR},
+      </if>
+      <if test="weight != null">
+        #{weight,jdbcType=VARCHAR},
       </if>
       <if test="delFlag != null">
         #{delFlag,jdbcType=TINYINT},
@@ -260,6 +271,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="currentIllnessHistoryQt != null">
+        #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultType="java.lang.Long">
@@ -310,8 +324,11 @@
       <if test="record.currentIllnessHistory != null">
         current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR},
       </if>
-      <if test="record.currentIllnessHistoryQt != null">
-        current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
+      <if test="record.height != null">
+        height = #{record.height,jdbcType=VARCHAR},
+      </if>
+      <if test="record.weight != null">
+        weight = #{record.weight,jdbcType=VARCHAR},
       </if>
       <if test="record.delFlag != null">
         del_flag = #{record.delFlag,jdbcType=TINYINT},
@@ -334,6 +351,9 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.currentIllnessHistoryQt != null">
+        current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -354,14 +374,16 @@
       id_card = #{record.idCard,jdbcType=VARCHAR},
       source = #{record.source,jdbcType=TINYINT},
       current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR},
-      current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
+      height = #{record.height,jdbcType=VARCHAR},
+      weight = #{record.weight,jdbcType=VARCHAR},
       del_flag = #{record.delFlag,jdbcType=TINYINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      remark = #{record.remark,jdbcType=VARCHAR}
+      remark = #{record.remark,jdbcType=VARCHAR},
+      current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -405,8 +427,11 @@
       <if test="currentIllnessHistory != null">
         current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR},
       </if>
-      <if test="currentIllnessHistoryQt != null">
-        current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      <if test="height != null">
+        height = #{height,jdbcType=VARCHAR},
+      </if>
+      <if test="weight != null">
+        weight = #{weight,jdbcType=VARCHAR},
       </if>
       <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=TINYINT},
@@ -429,6 +454,9 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="currentIllnessHistoryQt != null">
+        current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -446,14 +474,16 @@
       id_card = #{idCard,jdbcType=VARCHAR},
       source = #{source,jdbcType=TINYINT},
       current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR},
-      current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      height = #{height,jdbcType=VARCHAR},
+      weight = #{weight,jdbcType=VARCHAR},
       del_flag = #{delFlag,jdbcType=TINYINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

acupuncture-system/src/main/resources/mapper/system/PmsTreatmentMapper.xml

@@ -25,6 +25,8 @@
     <result column="diagnosis_name" jdbcType="VARCHAR" property="diagnosisName" />
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="height" jdbcType="INTEGER" property="height" />
+    <result column="weight" jdbcType="VARCHAR" property="weight" />
     <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -95,7 +97,8 @@
     id, patient_id, name, pinyin_full, pinyin_simple, gender, age, birth_date, ethnicity, 
     education_years, phone, id_card_type, id_card, visit_type, visit_number, visit_time, 
     discharge_time, doctor, dept_name, diagnosis_code, diagnosis_name, status, member_id, 
-    del_flag, tenant_id, create_by, create_time, update_by, update_time, remark
+    height, weight, del_flag, tenant_id, create_by, create_time, update_by, update_time, 
+    remark
   </sql>
   <select id="selectByExample" parameterType="com.acupuncture.system.domain.po.PmsTreatmentExample" resultMap="BaseResultMap">
     select
@@ -129,10 +132,10 @@
       id_card, visit_type, visit_number, 
       visit_time, discharge_time, doctor, 
       dept_name, diagnosis_code, diagnosis_name, 
-      status, member_id, del_flag, 
-      tenant_id, create_by, create_time, 
-      update_by, update_time, remark
-      )
+      status, member_id, height, 
+      weight, del_flag, tenant_id, 
+      create_by, create_time, update_by, 
+      update_time, remark)
     values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{pinyinFull,jdbcType=VARCHAR}, #{pinyinSimple,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, 
       #{age,jdbcType=INTEGER}, #{birthDate,jdbcType=DATE}, #{ethnicity,jdbcType=VARCHAR}, 
@@ -140,10 +143,10 @@
       #{idCard,jdbcType=VARCHAR}, #{visitType,jdbcType=TINYINT}, #{visitNumber,jdbcType=VARCHAR}, 
       #{visitTime,jdbcType=TIMESTAMP}, #{dischargeTime,jdbcType=TIMESTAMP}, #{doctor,jdbcType=VARCHAR}, 
       #{deptName,jdbcType=VARCHAR}, #{diagnosisCode,jdbcType=VARCHAR}, #{diagnosisName,jdbcType=VARCHAR}, 
-      #{status,jdbcType=TINYINT}, #{memberId,jdbcType=BIGINT}, #{delFlag,jdbcType=TINYINT}, 
-      #{tenantId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}
-      )
+      #{status,jdbcType=TINYINT}, #{memberId,jdbcType=BIGINT}, #{height,jdbcType=INTEGER}, 
+      #{weight,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{tenantId,jdbcType=BIGINT}, 
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.PmsTreatment">
     insert into pms_treatment
@@ -217,6 +220,12 @@
       <if test="memberId != null">
         member_id,
       </if>
+      <if test="height != null">
+        height,
+      </if>
+      <if test="weight != null">
+        weight,
+      </if>
       <if test="delFlag != null">
         del_flag,
       </if>
@@ -309,6 +318,12 @@
       <if test="memberId != null">
         #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="height != null">
+        #{height,jdbcType=INTEGER},
+      </if>
+      <if test="weight != null">
+        #{weight,jdbcType=VARCHAR},
+      </if>
       <if test="delFlag != null">
         #{delFlag,jdbcType=TINYINT},
       </if>
@@ -410,6 +425,12 @@
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=BIGINT},
       </if>
+      <if test="record.height != null">
+        height = #{record.height,jdbcType=INTEGER},
+      </if>
+      <if test="record.weight != null">
+        weight = #{record.weight,jdbcType=VARCHAR},
+      </if>
       <if test="record.delFlag != null">
         del_flag = #{record.delFlag,jdbcType=TINYINT},
       </if>
@@ -461,6 +482,8 @@
       diagnosis_name = #{record.diagnosisName,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=TINYINT},
       member_id = #{record.memberId,jdbcType=BIGINT},
+      height = #{record.height,jdbcType=INTEGER},
+      weight = #{record.weight,jdbcType=VARCHAR},
       del_flag = #{record.delFlag,jdbcType=TINYINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
       create_by = #{record.createBy,jdbcType=VARCHAR},
@@ -541,6 +564,12 @@
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="height != null">
+        height = #{height,jdbcType=INTEGER},
+      </if>
+      <if test="weight != null">
+        weight = #{weight,jdbcType=VARCHAR},
+      </if>
       <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=TINYINT},
       </if>
@@ -589,6 +618,8 @@
       diagnosis_name = #{diagnosisName,jdbcType=VARCHAR},
       status = #{status,jdbcType=TINYINT},
       member_id = #{memberId,jdbcType=BIGINT},
+      height = #{height,jdbcType=INTEGER},
+      weight = #{weight,jdbcType=VARCHAR},
       del_flag = #{delFlag,jdbcType=TINYINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},
       create_by = #{createBy,jdbcType=VARCHAR},

acupuncture-前台/.env.development

@@ -1,18 +1,18 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 开发环境配置
 ENV = 'development'
 
 # 大唐会议管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
-VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture/api/'
-VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/'
+VUE_APP_IMG_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
 
 # 访问地址
-VUE_APP_VISIT_URL = 'https://test.tall.wiki/acupuncture/client/'
+VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture/client/screening/h5'
+VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/screening/h5'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

acupuncture-前台/.env.production

@@ -1,15 +1,15 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 生产环境配置
 NODE_ENV = 'production'
 # 因孚生产
-VUE_APP_BASE_API = 'http://113.45.159.249:40010/acupuncture/api/'
-VUE_APP_API_QZURL = 'http://113.45.159.249:40010/acupuncture/api/'
+VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
 
 # 访问地址
-VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/'
+VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5'
+VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/screening/h5'
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/acupuncture/client/'
+VUE_APP_PUBLIC_PATH = '/acupuncture_ays/clientssl/'

acupuncture-前台/.env.productions

@@ -1,15 +1,15 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 生产环境配置
 NODE_ENV = 'production'
 # 因孚生产
-VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture/api/'
-VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture/api/'
+VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
 
 # 访问地址
-VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/'
+VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5'
+VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/screening/h5'
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/acupuncture/clientssl/'
+VUE_APP_PUBLIC_PATH = '/acupuncture_ays/clientssl/'

acupuncture-前台/.env.staging

@@ -1,15 +1,15 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 生产环境配置
 NODE_ENV = 'production'
 # 因孚生产
-VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture/api/'
-VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/'
+VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture_ays/api/'
 
 # 访问地址
-VUE_APP_VISIT_URL = 'https://test.tall.wiki/acupuncture/client/'
+VUE_APP_VISIT_URL = 'https://test.tall.wiki/acupuncture_ays/client/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture/client/screening/h5'
+VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture_ays/client/screening/h5'
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/acupuncture/client/'
+VUE_APP_PUBLIC_PATH = '/acupuncture_ays/client/'

acupuncture-前台/package.json

@@ -1,12 +1,11 @@
 {
   "name": "ruoyi",
   "version": "3.8.9",
-  "description": "朱琏针灸数据云系统",
+  "description": "体重管理数据云平台系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
     "build:prods": "vue-cli-service build --mode productions",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",

acupuncture-前台/public/index.html

@@ -124,7 +124,7 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #70483E;
+      background: #406E49;
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);

acupuncture-前台/src/api/medicalFile.js

@@ -72,6 +72,24 @@ export function selectReportByMemberId(data) {
     data: data,
   });
 }
+// ------ 运动 ------
+
+// 体质测试类数据
+export function queryMotionInfo(data) {
+  return request({
+    url: "/http/queryMotionInfo",
+    method: "post",
+    data: data,
+  });
+}
+// 人体成分
+export function queryMotionTcfInfo(data) {
+  return request({
+    url: "/http/queryMotionTcfInfo",
+    method: "post",
+    data: data,
+  });
+}
 // 评估报告单
 export function exportTreatmentPg(data) {
   return request({

acupuncture-前台/src/assets/styles/element-variables.scss

@@ -4,7 +4,7 @@
 **/
 
 /* theme color */
-$--color-primary: #c6a268;
+$--color-primary: #406e49;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;

acupuncture-前台/src/assets/styles/variables.scss

@@ -9,16 +9,16 @@ $yellow: #fec171;
 $panGreen: #30b08f;
 
 // 默认菜单主题风格
-$base-menu-color: #c7bdb1;
+$base-menu-color: #dad0a7;
 $base-menu-color-active: #f4f4f5;
-$base-menu-background: #70483e;
+$base-menu-background: #406e49;
 $base-logo-title-color: #ffffff;
 
-$base-menu-light-color: rgba(0, 0, 0, 0.7);
+$base-menu-light-color: rgba(64, 110, 73, 0.7);
 $base-menu-light-background: #ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background: #5a332a;
+$base-sub-menu-background: rgb(64, 110, 73);
 $base-sub-menu-hover: rgba(0, 0, 0, 0.2);
 
 // 自定义暗色菜单风格

acupuncture-前台/src/layout/components/Navbar.vue

@@ -13,7 +13,7 @@
       v-if="!topNav"
     /> -->
     <div class="logo-title">
-      朱琏针灸数据云系统（{{ userInfo.tenantName }}）
+      体重管理数据云平台系统（{{ userInfo.tenantName }}）
     </div>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
@@ -134,7 +134,7 @@ export default {
 <style lang="scss" scoped>
 .logo-title {
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   margin-left: 20px;
   font-weight: 600;

acupuncture-前台/src/layout/components/Sidebar/SidebarItem.vue

@@ -200,8 +200,8 @@ export default {
 </style>
 <style>
 #app .sidebar-container .theme-dark .is-active > .el-submenu__title {
-  color: #70483e !important;
-  background-color: #70483e !important;
+  color: #406e49 !important;
+  background-color: #406e49 !important;
 }
 #app .sidebar-container .theme-dark .is-active {
   background-color: #5a332a;
@@ -215,6 +215,7 @@ export default {
   background-color: #5a332a;
 }
 #app .sidebar-container .el-submenu__title:hover .header {
-  background-color: #5a3a32 !important;
+  background-color: #406e49 !important;
 }
 </style>
+>

acupuncture-前台/src/store/modules/settings.js

@@ -13,7 +13,7 @@ const {
 const storageSetting = JSON.parse(localStorage.getItem("layout-setting")) || "";
 const state = {
   title: "",
-  theme: "#70483E",
+  theme: "#406E49",
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,

acupuncture-前台/src/views/index.vue

@@ -57,14 +57,14 @@ export default {
     // firstAidTest().then((res) => {
     //   console.log(res);
     // });
-    const start = new Date();
-    const end = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-    await setTimeout(async () => {
-      await this.$refs.patient.statistics([start, end], 4);
-      await this.$refs.JM.statistics([start, end], 4);
-      await this.$refs.XGZL.statistics([start, end], 4);
-    });
+    // const start = new Date();
+    // const end = new Date();
+    // start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+    // await setTimeout(async () => {
+    //   await this.$refs.patient.statistics([start, end], 4);
+    //   await this.$refs.JM.statistics([start, end], 4);
+    //   await this.$refs.XGZL.statistics([start, end], 4);
+    // });
   },
   methods: {
     resize() {

acupuncture-前台/src/views/indexCom/JM.vue

@@ -414,7 +414,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-前台/src/views/indexCom/XGZL.vue

@@ -9,7 +9,7 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     中西医结合
                   </div>
                   <span class="dian" style="background: #d8d8d8"></span>
@@ -52,19 +52,19 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     治愈
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #906c4a"></span>
+                    <span class="dian" style="background: #00a046"></span>
                     显效
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     好转
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c7bdb1"></span>
+                    <span class="dian" style="background: #ebe4c6"></span>
                     无效
                   </div>
                 </div>
@@ -381,7 +381,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-前台/src/views/indexCom/follow.vue

@@ -89,46 +89,50 @@ export default {
     handleFollow() {
       followEcharts.series = [];
       let colorArr = [
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
       ];
       let index = 0;
       for (let key in this.followValue) {
@@ -254,7 +258,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-前台/src/views/indexCom/index.js

@@ -23,7 +23,7 @@ export const HZXX = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268"],
+  color: ["#dad0a7"],
   graphic: {
     type: "text",
     left: "center",
@@ -76,7 +76,7 @@ export const gende = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#70483E", "#C7BDB1"],
+  color: ["#406E49", "#dad0a7"],
   series: [
     {
       type: "pie",
@@ -108,7 +108,7 @@ export const ageEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -156,14 +156,14 @@ export const ageEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
       //     barBorderRadius: [50, 50, 0, 0],
       //     color: function (params) {
       //       var colorList = [
-      //         "#C6A268",
+      //         "#dad0a7",
       //       ];
       //       return colorList[params.dataIndex];
       //     },
@@ -179,7 +179,7 @@ export const diseaseEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -227,7 +227,7 @@ export const diseaseEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
     },
   ],
 };
@@ -240,7 +240,7 @@ export const diagnoseEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -290,7 +290,7 @@ export const diagnoseEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#906C4A",
+      color: "#406E49",
     },
   ],
 };
@@ -301,7 +301,7 @@ export const systemEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -349,7 +349,7 @@ export const systemEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -366,7 +366,7 @@ export const physiqueEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -414,7 +414,7 @@ export const physiqueEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -447,7 +447,7 @@ export const postureEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C7BDB1", "#C6A268", "#906C4A", "#70483E", "#582518"],
+  color: ["#C7BDB1", "#dad0a7", "#906C4A", "#406E49", "#582518"],
   series: [
     {
       type: "pie",
@@ -479,7 +479,7 @@ export const agrypniaEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -527,7 +527,7 @@ export const agrypniaEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -544,7 +544,7 @@ export const anxietyEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -592,7 +592,7 @@ export const anxietyEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -626,7 +626,7 @@ export const healTypeEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268", "#D8D8D8"],
+  color: ["#dad0a7", "#D8D8D8"],
   series: [
     {
       type: "pie",
@@ -658,7 +658,7 @@ export const diseaseMethodEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -747,7 +747,7 @@ export const effectEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268", "#906C4A", "#70483E", "#C7BDB1"],
+  color: ["#dad0a7", "#00A046", "#406E49", "#EBE4C6"],
   series: [
     {
       type: "pie",
@@ -779,7 +779,7 @@ export const costEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -827,7 +827,7 @@ export const costEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -844,7 +844,7 @@ export const followEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -895,7 +895,7 @@ export const lossFollowEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -968,7 +968,7 @@ export const lossFollowEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]

acupuncture-前台/src/views/indexCom/patient.vue

@@ -41,10 +41,10 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     男
                   </div>
-                  <span class="dian" style="background: #c7bdb1"></span>
+                  <span class="dian" style="background: #dad0a7"></span>
                   女
                 </div>
               </div>
@@ -283,7 +283,7 @@ export default {
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
 .div-hz {
-  background: #c6a268;
+  background: #dad0a7;
   width: 80%;
   height: 70%;
   border-radius: 10px;
@@ -372,7 +372,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-前台/src/views/indexCom/query.vue

@@ -170,12 +170,13 @@ export default {
   align-items: center;
   font-size: 20px;
   font-weight: 600;
+  color: #406e49;
 }
 .title-bor {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-前台/src/views/login.vue

@@ -8,10 +8,10 @@
         :rules="loginRules"
         class="login-form"
       >
-        <h3 class="title" style="color: #fff; text-align: left">
+        <h3 class="title11" style="color: #406e49; text-align: left">
           登录到
           <br />
-          朱琏针灸数据云系统
+          体重管理数据云平台系统
         </h3>
         <el-form-item prop="username">
           <el-input
@@ -62,7 +62,7 @@
         </el-form-item>
         <el-checkbox
           v-model="loginForm.rememberMe"
-          style="margin: 0px 0px 25px 0px; color: #fff"
+          style="margin: 0px 0px 25px 0px; color: #406e49"
           >记住密码</el-checkbox
         >
         <el-form-item style="width: 100%">
@@ -243,11 +243,12 @@ export default {
   }
 }
 
-.title {
+.title11 {
   font-size: 26 px;
   margin: 0px auto 30px auto;
   text-align: left;
   color: #fff;
+  font-weight: bold;
   line-height: 28px;
 }
 

acupuncture-前台/src/views/medicalFile/details.vue

@@ -85,7 +85,7 @@
             <a name="病情评估"></a>
             <div class="div-title1">病情评估</div>
             <div class="div-title2">
-              人体成分分析
+              人体成分
               <span
                 @click="getHumanBody"
                 class="foem-item-pg"
@@ -219,6 +219,148 @@
               />
             </el-form-item>
           </div>
+          <!-- 运动功能测试与评估 -->
+          <div>
+            <div class="div-title2">
+              运动功能测试与评估
+              <span
+                @click="getMotionInfo"
+                class="foem-item-pg"
+                :class="{
+                  'item-pg-disabled': form.status != 0 && form.status != 3,
+                }"
+                >同步</span
+              >
+            </div>
+            <div class="human-body">
+              <el-form-item label="握力" prop="WOLI">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['WOLI']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="肺活量" prop="FHL">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['FHL']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="纵跳" prop="ZT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['ZT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="俯卧撑" prop="FWC">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['FWC']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="仰卧起坐" prop="YWQZ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['YWQZ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="体前屈" prop="TQQ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['TQQ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="闭眼单脚站立" prop="BYDJ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['BYDJ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="反应时" prop="FYS">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['FYS']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="功率自行车" prop="BIKE">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['BIKE']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="2分钟原地高抬腿" prop="GTT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['GTT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="30秒坐站" prop="ZZ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['ZZ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="立定跳远" prop="LT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['LT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="双脚连续跳" prop="LXT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['LXT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="15米绕障碍跑" prop="ZA">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['ZA']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="走平衡木" prop="PHM">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['PHM']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="BMI" prop="BMI">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['BMI']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="体脂率" prop="PBF">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['PBF']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="体测总分" prop="Score">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['Score']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+            </div>
+          </div>
           <div style="height: 10px"></div>
           <a name="中医体质辨识"></a>
           <div class="div-title2">
@@ -769,6 +911,8 @@ import {
   selectReportByMemberId,
   zytzQrcode,
   evaResult,
+  queryMotionInfo,
+  queryMotionTcfInfo,
 } from "@/api/medicalFile";
 import { followupQuery } from "@/api/followupFile";
 // 体态评估
@@ -1265,6 +1409,25 @@ export default {
         ZLFA_YW_QT: "", // 其他-药物治疗
 
         SFDL: [], //随访队列
+        // 运动
+        WOLI: "", //握力
+        FHL: "", //肺活量
+        ZT: "", //纵跳
+        FWC: "", // 俯卧撑
+        YWQZ: "", // 仰卧起坐
+        TQQ: "", // 体前屈
+        BYDJ: "", // 闭眼单脚站立
+        FYS: "", // 反应时
+        BIKE: "", // 功率自行车
+        GTT: "", // 2分钟原地高抬腿
+        ZZ: "", // 30秒坐站
+        LT: "", // 立定跳远
+        LXT: "", // 双脚连续跳
+        ZA: "", // 15米绕障碍跑
+        PHM: "", // 走平衡木
+        BMI: "", //BMI
+        PBF: "", //体脂率
+        Score: "", //体测总分
       }, // 档案详情表单
       qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
       selectReportUrl: "",
@@ -1286,7 +1449,7 @@ export default {
       zytzQrcode({
         param: {
           id: this.form.id,
-          // rewrite: 1,
+          rewrite: 1,
           path: `${process.env.VUE_APP_VISIT_URL}medicalEva?id=${this.form.id}&name=${this.form.name}&phone=${this.form.phone}&tenantId=${this.userInfo.tenantId}`,
         },
       }).then((res) => {
@@ -1319,25 +1482,61 @@ export default {
       }
       return matches;
     },
-    // 人体成分报告
-    getHumanBodyReport() {
-      selectReportByMemberId({
-        memberId: this.form.visitNumber,
+    // 查询人体成分 - 安阳人体成分
+    getHumanBody() {
+      queryMotionTcfInfo({
+        memberId: this.form.memberId,
       }).then((res) => {
-        if (!res.data.id) {
-          this.$modal.msgError("暂无报告");
+        if (!res.data) {
+          this.getHumanBody1(); // 调用新接口 - 针灸人体成分
+          // this.$modal.msgError("暂无数据");
           return;
         }
-        this.humanBodyOpen = true;
-        this.selectReportUrl = `${this.qzUrl}${res.data.fileName}`;
+        const {
+          weight, //体重
+          fat, //脂肪
+          bone, //骨质
+          protein, //蛋白质
+          water, //水分
+          muscle, //肌肉
+          smm, //骨骼肌
+          pbf, //体脂百分比
+          bmi, //体质指数
+          whr, //腰臀比（2位小数）
+          vfi, //内脏脂肪指数
+          bodyAge, //身体年龄
+          score, //健康评分
+          bodyType, //体型判定
+          lbm, //瘦体重（去脂体重）
+        } = res.data.data;
+
+        console.log("人体成分", res.data.data);
+
+        this.detailsForm.PG_RTCF_TZ = weight; // 体重
+        this.detailsForm.PG_RTCF_QZTZ = lbm; // 去脂体重
+        this.detailsForm.PG_RTCF_JRL = muscle; // 肌肉量
+        this.detailsForm.PG_RTCF_TBW = water; // 总水分（TBW）
+        this.detailsForm.PG_RTCF_DBZ = protein; // 蛋白质
+        this.detailsForm.PG_RTCF_GZ = bone; // 骨质量（GZ）
+        this.detailsForm.PG_RTCF_ZF = fat; // 脂肪
+        this.detailsForm.PG_RTCF_PBF = pbf; // 体脂百分比
+        this.detailsForm.PG_RTCF_GGJ = smm; //骨骼肌
+        this.detailsForm.PG_RTCF_BMI = bmi; // 体质指数（BMI）
+        this.detailsForm.PG_RTCF_WHR = whr; // 腰臀比（WHR）
+        this.detailsForm.PG_RTCF_NZZFSP = vfi; // 内脏脂肪水平
+        // this.detailsForm.PG_RTCF_STGCFBFB = ""; // 身体各成分百分比
+        this.detailsForm.PG_RTCF_TXLX = bodyType; // 体型类型
+        this.detailsForm.PG_RTCF_STNL = bodyAge; // 身体年龄
+        this.detailsForm.PG_RTCF_JKPF = score; // 健康评分
+        this.$modal.msgSuccess("同步成功");
       });
     },
-    // 查询人体成分
-    getHumanBody() {
+    // 查询人体成分 - 针灸人体成分
+    getHumanBody1() {
       selectByMemberId({
         id: this.form.id,
       }).then((res) => {
-        if (!res.data.id) {
+        if (!res.data?.id) {
           this.$modal.msgError("暂无数据");
           return;
         }
@@ -1380,6 +1579,21 @@ export default {
         this.detailsForm.PG_RTCF_JKPF = score; // 健康评分
       });
     },
+    // 运动运动功能测试与评估
+    getMotionInfo() {
+      queryMotionInfo({
+        memberId: this.form.memberId,
+      }).then((res) => {
+        if (!res.data) {
+          this.$modal.msgError("暂无数据");
+          return;
+        }
+        res.data.data.forEach((item) => {
+          this.detailsForm[item.Item] = item.Value;
+        });
+        this.$modal.msgSuccess("同步成功");
+      });
+    },
     // 判断是否显示诊疗方法
     getzzffShow(_title) {
       const { JBXX_ZYZD, JBXX_ZYZD_QT } = this.detailsForm;
@@ -1529,6 +1743,25 @@ export default {
         ZLFA_YW_QT: "", // 其他-药物治疗
 
         SFDL: [], //随访队列
+        // 运动
+        WOLI: "", //握力
+        FHL: "", //肺活量
+        ZT: "", //纵跳
+        FWC: "", // 俯卧撑
+        YWQZ: "", // 仰卧起坐
+        TQQ: "", // 体前屈
+        BYDJ: "", // 闭眼单脚站立
+        FYS: "", // 反应时
+        BIKE: "", // 功率自行车
+        GTT: "", // 2分钟原地高抬腿
+        ZZ: "", // 30秒坐站
+        LT: "", // 立定跳远
+        LXT: "", // 双脚连续跳
+        ZA: "", // 15米绕障碍跑
+        PHM: "", // 走平衡木
+        BMI: "", //BMI
+        PBF: "", //体脂率
+        Score: "", //体测总分
       };
     },
 
@@ -1705,8 +1938,8 @@ export default {
 }
 
 .span-but-active {
-  color: #70483e;
-  border: 1px solid #70483e;
+  color: #406e49;
+  border: 1px solid #406e49;
 }
 
 .human-body {

acupuncture-前台/src/views/medicalFile/h5Result.vue

@@ -54,7 +54,7 @@ export default {
 .hospital {
   background: #fff;
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   font-weight: 600;
   margin-bottom: 10px;
@@ -109,8 +109,8 @@ export default {
 }
 /*  */
 .app-container {
-  /* background: linear-gradient(to bottom, #70483e, #f7f8fa); */
-  background: #70483e;
+  /* background: linear-gradient(to bottom, #406E49, #f7f8fa); */
+  background: #406e49;
   min-height: 100vh;
 }
 </style>

acupuncture-前台/src/views/medicalFile/h5eva.vue

@@ -189,7 +189,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -199,7 +199,7 @@ export default {
 .hospital {
   background: #fff;
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   font-weight: 600;
   margin-bottom: 10px;
@@ -245,7 +245,7 @@ export default {
   align-items: center;
 }
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
 }
@@ -268,8 +268,8 @@ export default {
 }
 /*  */
 .app-container {
-  /* background: linear-gradient(to bottom, #70483e, #f7f8fa); */
-  background: #70483e;
+  /* background: linear-gradient(to bottom, #406E49, #f7f8fa); */
+  background: #406e49;
   min-height: 100vh;
 }
 >>> .el-input__inner {

acupuncture-前台/src/views/medicalFile/index.vue

@@ -980,9 +980,16 @@ export default {
     let patientInfo;
     if (this.$route.query.patientInfo) {
       this.form = JSON.parse(this.$route.query.patientInfo);
+      this.form = {
+        ...JSON.parse(this.$route.query.patientInfo),
+        visitType: 0, // 门诊/住院
+        visitNumber: "", // 门诊/住院号
+        visitTime: "", // 门诊/住院时间
+        dischargeTime: "", // 出院时间
+        doctor: "", // 责任医生
+        status: 0, // 保存
+      };
       delete this.form.id;
-      this.form.visitType = 0; // 门诊/住院
-      this.form.status = 0; // 保存
       this.open = true;
     }
     this.getList();

acupuncture-前台/src/views/register.vue

@@ -6,7 +6,7 @@
       :rules="registerRules"
       class="register-form"
     >
-      <h3 class="title">朱琏针灸数据云系统</h3>
+      <h3 class="title">体重管理数据云平台系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="registerForm.username"

acupuncture-前台/src/views/screening/h5.vue

@@ -1,30 +1,30 @@
 <template>
   <div class="app-container">
     <div class="hospital">
-      南宁市“享‘瘦’美好·邕抱健康”
+      安阳市“安享阳光，瘦出美好模样”
       <br />
       全民科学减重活动知情同意书
     </div>
     <div class="zqty">
       <div class="text-bt">尊敬的先生/女士：</div>
       <div class="text-dl">
-        您好！非常感谢您参与南宁市“享‘瘦’美好·邕抱健康”全民科学减重活动。本次活动是南宁市“体重管理年”系列活动之一，旨在倡导市民树立“每个人是健康第一责任人”理念，科学管理体重，提升健康水平。
+        您好！非常感谢您参与安阳市“安享阳光，瘦出美好模样”全民科学减重活动。本次活动是安阳市“体重管理年”系列活动之一，旨在倡导市民树立“每个人是健康第一责任人”理念，科学管理体重，提升健康水平。
       </div>
       <div class="text-dl">在您参与此次活动前，请您仔细阅读以下内容：</div>
       <div class="text-dl">
         1.本活动按照自愿参加、知情同意、公益健康的原则，倡导符合入选标准的市民参加。
       </div>
       <div class="text-dl">
-        2.请您如实填写报名信息，身体质量指数（BMI）以市第七人民医院现场测量的数据作为评判最终入选的标准；报名信息提交成功后，请您按照小程序的提示预约现场测量时间地点。
+        2.请您如实填写报名信息，身体质量指数（BMI）以安阳市人民医院现场测量的数据作为评判最终入选的标准；报名信息提交成功后，请您按照小程序的提示预约现场测量时间地点。
       </div>
       <div class="text-dl">
-        3.科学减重需循序渐进，进行合理的饮食控制和定期的体育锻炼，请您在市第七人民医院专业减重团队的指导下，自律遵守有关项目管理要求，自觉改变不利于体重管理的行为习惯，按时参与数据填报及回访工作。
+        3.科学减重需循序渐进，进行合理的饮食控制和定期的体育锻炼，请您在安阳市人民医院专业减重团队的指导下，自律遵守有关项目管理要求，自觉改变不利于体重管理的行为习惯，按时参与数据填报及回访工作。
       </div>
       <div class="text-dl">
-        4.市第七人民医院采用的体重管理方法已通过严格的医学验证与实践检验，安全可靠。
+        4.安阳市人民医院采用的体重管理方法已通过严格的医学验证与实践检验，安全可靠。
       </div>
       <div class="text-dl">
-        5.若在活动过程中，您因身体突发状况或其他不可抗力因素需要退出，请及时告知市第七人民医院，我们将尊重您的决定，并妥善处理后续事宜
+        5.若在活动过程中，您因身体突发状况或其他不可抗力因素需要退出，请及时告知安阳市人民医院，我们将尊重您的决定，并妥善处理后续事宜
         。
       </div>
       <div class="text-dl">
@@ -75,7 +75,7 @@ export default {
       if (!this.flag) {
         this.$message({
           type: "error",
-          message: "请先同意南宁市健康体重管理活动知情同意书",
+          message: "请先同意安阳市健康体重管理活动知情同意书",
         });
         return;
       }
@@ -118,7 +118,7 @@ export default {
   text-align: center;
 }
 .btn-dl-gl {
-  color: #c6a268;
+  color: #dad0a7;
 }
 .btn-dl-ty {
   margin-right: 16px;
@@ -171,7 +171,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -181,7 +181,7 @@ export default {
 .hospital {
   background: #fff;
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   font-weight: 600;
   margin-bottom: 10px;
   border-radius: 6px;
@@ -224,7 +224,7 @@ export default {
   align-items: center;
 }
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
 }
@@ -247,8 +247,8 @@ export default {
 }
 /*  */
 .app-container {
-  /* background: linear-gradient(to bottom, #70483e, #f7f8fa); */
-  background: #70483e;
+  /* background: linear-gradient(to bottom, #406E49, #f7f8fa); */
+  background: #406e49;
   min-height: 100vh;
 }
 >>> .el-input__inner {

acupuncture-前台/src/views/screening/h5Result.vue

@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="card card1" v-if="weightShow">
-      请您扫码关注南宁市第七人民医院微信公众号，预约身高、体重等健康指标综合测量。流程为公众号➙体重管理➙减重预约挂号➙体重管理中心➙选择医师和时间➙按时到现场测量。本项目已减免了挂号费，请按预约时间前往南宁市第七人民医院金桥院区2楼体重管理中心（地址：兴宁区金桥路120号）进行全面测量评估（医生有余号的均可点击预约，如当周预约已满，可在下周预约）。咨询电话：0771-2312932、0771-2312933。谢谢您的支持参与！
+      请您扫码关注安阳市人民医院微信公众号，预约身高、体重等健康指标综合测量。流程为公众号➙体重管理➙减重预约挂号➙体重管理中心➙选择医师和时间➙按时到现场测量。本项目已减免了挂号费，请按预约时间前往安阳市人民医院东院区门诊3楼体检中心（地址：安阳市北关区解放大道72号安阳市人民医院）进行全面测量评估（医生有余号的均可点击预约，如当周预约已满，可在下周预约）。咨询电话：0372-3335119、0372-5950120、0372-3335796。谢谢您的支持参与！
       <div>
         <img src="./gzh.jpg" style="max-width: 100%" />
       </div>
@@ -139,7 +139,7 @@ export default {
 .hospital {
   background: #fff;
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   font-weight: 600;
   margin-bottom: 10px;
@@ -197,8 +197,8 @@ export default {
 }
 /*  */
 .app-container {
-  /* background: linear-gradient(to bottom, #70483e, #f7f8fa); */
-  background: #70483e;
+  /* background: linear-gradient(to bottom, #406E49, #f7f8fa); */
+  background: #406e49;
   min-height: 100vh;
 }
 </style>

acupuncture-前台/src/views/screening/h5eva.vue

@@ -6,7 +6,7 @@
       :rules="rules"
       ref="form"
       :model="form"
-      label-width="135px"
+      label-width="140px"
     >
       <!-- 姓名、性别（单选）、出生日期、年龄、联系方式 -->
       <div class="card">
@@ -1057,7 +1057,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -1067,7 +1067,7 @@ export default {
 .hospital {
   background: #fff;
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   font-weight: 600;
   margin-bottom: 10px;
@@ -1117,7 +1117,7 @@ export default {
 }
 
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
   margin-bottom: 10px;
@@ -1147,8 +1147,8 @@ export default {
 }
 /*  */
 .app-container {
-  /* background: linear-gradient(to bottom, #70483e, #f7f8fa); */
-  background: #70483e;
+  /* background: linear-gradient(to bottom, #406E49, #f7f8fa); */
+  background: #406e49;
   min-height: 100vh;
 }
 >>> .el-input__inner {

acupuncture-前台/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = process.env.VUE_APP_TITLE || "朱琏针灸数据云系统"; // 网页标题
+const name = process.env.VUE_APP_TITLE || "体重管理数据云平台系统"; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
@@ -39,7 +39,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://test.tall.wiki/acupuncture/api/`,
+        target: `https://nnzjpt.ylinno.com/acupuncture_ays/api/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

acupuncture-后台/.env.development

@@ -1,13 +1,13 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 开发环境配置
 ENV = 'development'
 
 # 大唐会议管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
-VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture/api/'
-VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/'
+VUE_APP_IMG_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 访问路径

acupuncture-后台/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 生产环境配置
 NODE_ENV = 'production'

acupuncture-后台/.env.productions

@@ -1,12 +1,12 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 生产环境配置
 NODE_ENV = 'production'
 # 因孚生产
-VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture/api/'
-VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture/api/'
+VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5'
+VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/screening/h5'
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/acupuncture/adminssl/'
+VUE_APP_PUBLIC_PATH = '/acupuncture_ays/adminssl/'

acupuncture-后台/.env.staging

@@ -1,12 +1,12 @@
 # 页面标题
-VUE_APP_TITLE = 朱琏针灸数据云系统
+VUE_APP_TITLE = 体重管理数据云平台系统
 
 # 生产环境配置
 NODE_ENV = 'production'
 # 因孚生产
-VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture/api/'
-VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/'
+VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture_ays/api/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture/admin/screening/h5'
+VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture_ays/admin/screening/h5'
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/acupuncture/admin/'
+VUE_APP_PUBLIC_PATH = '/acupuncture_ays/admin/'

acupuncture-后台/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.9",
-  "description": "朱琏针灸数据云系统",
+  "description": "体重管理数据云平台系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {

acupuncture-后台/public/index.html

@@ -124,7 +124,7 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #70483E;
+      background: #406E49;
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);

acupuncture-后台/src/assets/styles/element-variables.scss

@@ -4,7 +4,7 @@
 **/
 
 /* theme color */
-$--color-primary: #c6a268;
+$--color-primary: #dad0a7;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;

acupuncture-后台/src/assets/styles/variables.scss

@@ -9,17 +9,17 @@ $yellow: #fec171;
 $panGreen: #30b08f;
 
 // 默认菜单主题风格
-$base-menu-color: #fff;
+$base-menu-color: #dad0a7;
 $base-menu-color-active: #f4f4f5;
-$base-menu-background: #70483e;
+$base-menu-background: #406e49;
 $base-logo-title-color: #ffffff;
 
-$base-menu-light-color: rgba(0, 0, 0, 0.7);
+$base-menu-light-color: rgba(64, 110, 73, 0.7);
 $base-menu-light-background: #ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background: #70483e;
-$base-sub-menu-hover: #69443a;
+$base-sub-menu-background: rgb(64, 110, 73);
+$base-sub-menu-hover: rgba(0, 0, 0, 0.2);
 
 // 自定义暗色菜单风格
 /**

acupuncture-后台/src/store/modules/permission.js

@@ -126,12 +126,13 @@ export function filterDynamicRoutes(routes) {
 }
 
 export const loadView = (view) => {
-  if (process.env.NODE_ENV === "development") {
   return (resolve) => require([`@/views/${view}`], resolve);
-  } else {
-    // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`);
-  }
+  // if (process.env.NODE_ENV === "development") {
+  //   return (resolve) => require([`@/views/${view}`], resolve);
+  // } else {
+  //   // 使用 import 实现生产环境的路由懒加载
+  //   return () => import(`@/views/${view}`);
+  // }
 };
 
 export default permission;

acupuncture-后台/src/store/modules/settings.js

@@ -13,7 +13,7 @@ const {
 const storageSetting = JSON.parse(localStorage.getItem("layout-setting")) || "";
 const state = {
   title: "",
-  theme: storageSetting.theme || "#C6A268",
+  theme: storageSetting.theme || "#dad0a7",
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,

acupuncture-后台/src/views/indexCom/JM.vue

@@ -414,7 +414,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/indexCom/XGZL.vue

@@ -9,7 +9,7 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     中西医结合
                   </div>
                   <span class="dian" style="background: #d8d8d8"></span>
@@ -52,19 +52,19 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     治愈
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #906c4a"></span>
+                    <span class="dian" style="background: #00a046"></span>
                     显效
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     好转
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c7bdb1"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     无效
                   </div>
                 </div>
@@ -381,7 +381,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/indexCom/follow.vue

@@ -89,46 +89,50 @@ export default {
     handleFollow() {
       followEcharts.series = [];
       let colorArr = [
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
-        "#C7BDB1",
-        "#C6A268",
-        "#906C4A",
-        "#70483E",
-        "#582518",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
       ];
       let index = 0;
       for (let key in this.followValue) {
@@ -254,7 +258,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/indexCom/index.js

@@ -23,7 +23,7 @@ export const HZXX = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268"],
+  color: ["#dad0a7"],
   graphic: {
     type: "text",
     left: "center",
@@ -76,7 +76,7 @@ export const gende = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#70483E", "#C7BDB1"],
+  color: ["#406E49", "#dad0a7"],
   series: [
     {
       type: "pie",
@@ -108,7 +108,7 @@ export const ageEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -156,14 +156,14 @@ export const ageEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
       //     barBorderRadius: [50, 50, 0, 0],
       //     color: function (params) {
       //       var colorList = [
-      //         "#C6A268",
+      //         "#dad0a7",
       //       ];
       //       return colorList[params.dataIndex];
       //     },
@@ -179,7 +179,7 @@ export const diseaseEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -227,7 +227,7 @@ export const diseaseEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
     },
   ],
 };
@@ -240,7 +240,7 @@ export const diagnoseEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -290,7 +290,7 @@ export const diagnoseEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#906C4A",
+      color: "#406E49",
     },
   ],
 };
@@ -301,7 +301,7 @@ export const systemEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -349,7 +349,7 @@ export const systemEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -366,7 +366,7 @@ export const physiqueEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -414,7 +414,7 @@ export const physiqueEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -447,7 +447,7 @@ export const postureEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C7BDB1", "#C6A268", "#906C4A", "#70483E", "#582518"],
+  color: ["#C7BDB1", "#dad0a7", "#906C4A", "#406E49", "#582518"],
   series: [
     {
       type: "pie",
@@ -479,7 +479,7 @@ export const agrypniaEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -527,7 +527,7 @@ export const agrypniaEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -544,7 +544,7 @@ export const anxietyEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -592,7 +592,7 @@ export const anxietyEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -626,7 +626,7 @@ export const healTypeEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268", "#D8D8D8"],
+  color: ["#dad0a7", "#D8D8D8"],
   series: [
     {
       type: "pie",
@@ -658,7 +658,7 @@ export const diseaseMethodEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -747,7 +747,7 @@ export const effectEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268", "#906C4A", "#70483E", "#C7BDB1"],
+  color: ["#dad0a7", "#00A046", "#406E49", "#dad0a7"],
   series: [
     {
       type: "pie",
@@ -779,7 +779,7 @@ export const costEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -827,7 +827,7 @@ export const costEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -844,7 +844,7 @@ export const followEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -895,7 +895,7 @@ export const lossFollowEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -968,7 +968,7 @@ export const lossFollowEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]

acupuncture-后台/src/views/indexCom/patient.vue

@@ -41,10 +41,10 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     男
                   </div>
-                  <span class="dian" style="background: #c7bdb1"></span>
+                  <span class="dian" style="background: #dad0a7"></span>
                   女
                 </div>
               </div>
@@ -283,7 +283,7 @@ export default {
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
 .div-hz {
-  background: #c6a268;
+  background: #dad0a7;
   width: 80%;
   height: 70%;
   border-radius: 10px;
@@ -372,7 +372,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/indexCom/query.vue

@@ -147,7 +147,10 @@ export default {
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
-. >>> .el-radio--small.is-bordered {
+>>> .el-card {
+  margin-bottom: 0 !important;
+}
+>>> .el-radio--small.is-bordered {
   margin-right: 20px !important;
   margin-left: 0 !important;
 }
@@ -167,12 +170,13 @@ export default {
   align-items: center;
   font-size: 20px;
   font-weight: 600;
+  color: #406e49;
 }
 .title-bor {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/login.vue

@@ -8,10 +8,10 @@
         :rules="loginRules"
         class="login-form"
       >
-        <h3 class="title">
+        <h3 class="title11">
           登录到
           <br />
-          朱琏针灸数据云系统
+          体重管理数据云平台系统
         </h3>
         <el-form-item prop="username">
           <el-input
@@ -243,11 +243,12 @@ export default {
   }
 }
 
-.title {
+.title11 {
   font-size: 26 px;
   margin: 0px auto 30px auto;
   text-align: left;
   color: #fff;
+  font-weight: bold;
   line-height: 28px;
 }
 

acupuncture-后台/src/views/medicalFile/details.vue

@@ -83,7 +83,7 @@
             <a name="病情评估"></a>
             <div class="div-title1">病情评估</div>
             <div class="div-title2">
-              人体成分分析
+              人体成分
               <!-- <span @click="getHumanBody" class="foem-item-pg">同步</span> -->
               <!-- <span
                 style="margin-left: 10px"
@@ -93,6 +93,7 @@
               > -->
             </div>
           </div>
+
           <div class="human-body">
             <el-form-item label="体重" prop="PG_RTCF_TZ">
               <el-input
@@ -209,11 +210,144 @@
             </el-form-item>
             <el-form-item label="健康评分" prop="PG_RTCF_JKPF">
               <el-input
+                :disabled="form.status != 0 && form.status != 3"
                 v-model="detailsForm['PG_RTCF_JKPF']"
                 placeholder="请输入"
               />
             </el-form-item>
           </div>
+          <!-- 运动功能测试与评估 -->
+          <div>
+            <div class="div-title2">运动功能测试与评估</div>
+            <div class="human-body">
+              <el-form-item label="握力" prop="WOLI">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['WOLI']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="肺活量" prop="FHL">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['FHL']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="纵跳" prop="ZT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['ZT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="俯卧撑" prop="FWC">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['FWC']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="仰卧起坐" prop="YWQZ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['YWQZ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="体前屈" prop="TQQ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['TQQ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="闭眼单脚站立" prop="BYDJ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['BYDJ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="反应时" prop="FYS">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['FYS']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="功率自行车" prop="BIKE">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['BIKE']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="2分钟原地高抬腿" prop="GTT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['GTT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="30秒坐站" prop="ZZ">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['ZZ']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="立定跳远" prop="LT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['LT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="双脚连续跳" prop="LXT">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['LXT']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="15米绕障碍跑" prop="ZA">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['ZA']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="走平衡木" prop="PHM">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['PHM']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="BMI" prop="BMI">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['BMI']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="体脂率" prop="PBF">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['PBF']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+              <el-form-item label="体测总分" prop="Score">
+                <el-input
+                  :disabled="form.status != 0 && form.status != 3"
+                  v-model="detailsForm['Score']"
+                  placeholder="请输入"
+                />
+              </el-form-item>
+            </div>
+          </div>
           <div style="height: 10px"></div>
           <a name="中医体质辨识"></a>
           <div class="div-title2">中医体质辨识</div>
@@ -1202,6 +1336,25 @@ export default {
         ZLFA_YW_QT: "", // 其他-药物治疗
 
         SFDL: [], //随访队列
+        // 运动
+        WOLI: "", //握力
+        FHL: "", //肺活量
+        ZT: "", //纵跳
+        FWC: "", // 俯卧撑
+        YWQZ: "", // 仰卧起坐
+        TQQ: "", // 体前屈
+        BYDJ: "", // 闭眼单脚站立
+        FYS: "", // 反应时
+        BIKE: "", // 功率自行车
+        GTT: "", // 2分钟原地高抬腿
+        ZZ: "", // 30秒坐站
+        LT: "", // 立定跳远
+        LXT: "", // 双脚连续跳
+        ZA: "", // 15米绕障碍跑
+        PHM: "", // 走平衡木
+        BMI: "", //BMI
+        PBF: "", //体脂率
+        Score: "", //体测总分
       }, // 档案详情表单
       qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
       selectReportUrl: "",
@@ -1426,6 +1579,25 @@ export default {
         ZLFA_YW_QT: "", // 其他-药物治疗
 
         SFDL: [], //随访队列
+        // 运动
+        WOLI: "", //握力
+        FHL: "", //肺活量
+        ZT: "", //纵跳
+        FWC: "", // 俯卧撑
+        YWQZ: "", // 仰卧起坐
+        TQQ: "", // 体前屈
+        BYDJ: "", // 闭眼单脚站立
+        FYS: "", // 反应时
+        BIKE: "", // 功率自行车
+        GTT: "", // 2分钟原地高抬腿
+        ZZ: "", // 30秒坐站
+        LT: "", // 立定跳远
+        LXT: "", // 双脚连续跳
+        ZA: "", // 15米绕障碍跑
+        PHM: "", // 走平衡木
+        BMI: "", //BMI
+        PBF: "", //体脂率
+        Score: "", //体测总分
       };
     },
 
@@ -1597,8 +1769,8 @@ export default {
 }
 
 .span-but-active {
-  color: #70483e;
-  border: 1px solid #70483e;
+  color: #406e49;
+  border: 1px solid #406e49;
 }
 
 .human-body {

acupuncture-后台/src/views/patientFile/index.vue

@@ -114,6 +114,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="姓名"
         min-width="130"
         show-overflow-tooltip
         align="center"

acupuncture-后台/src/views/register.vue

@@ -6,7 +6,7 @@
       :rules="registerRules"
       class="register-form"
     >
-      <h3 class="title">朱琏针灸数据云系统</h3>
+      <h3 class="title">体重管理数据云平台系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="registerForm.username"

acupuncture-后台/src/views/screening/h5.vue

@@ -652,7 +652,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -662,7 +662,7 @@ export default {
 .hospital {
   background: #fff;
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   font-weight: 600;
   margin-bottom: 10px;
@@ -705,7 +705,7 @@ export default {
   align-items: center;
 }
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
   margin-bottom: 10px;
@@ -728,8 +728,8 @@ export default {
 }
 /*  */
 .app-container {
-  /* background: linear-gradient(to bottom, #70483e, #f7f8fa); */
-  background: #70483e;
+  /* background: linear-gradient(to bottom, #406E49, #f7f8fa); */
+  background: #406e49;
   min-height: 100vh;
 }
 >>> .el-input__inner {

acupuncture-后台/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = process.env.VUE_APP_TITLE || "朱琏针灸数据云系统"; // 网页标题
+const name = process.env.VUE_APP_TITLE || "体重管理数据云平台系统"; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
@@ -39,7 +39,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://test.tall.wiki/acupuncture/api/`,
+        target: `https://nnzjpt.ylinno.com/acupuncture_ays/api/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",