From 0c18e1820a94d3021ba4d5d60ddff31152a3d550 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 2 Apr 2019 11:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/dal/IChargeRecordDao.java | 20 ++ .../lyms/platform/biz/dal/IHealthChargeDao.java | 21 ++ .../platform/biz/dal/impl/ChargeRecordDaoImpl.java | 40 +++ .../platform/biz/dal/impl/HealthChargeDaoImpl.java | 40 +++ .../platform/biz/service/ChargeRecordService.java | 55 ++++ .../platform/biz/service/HealthChargeService.java | 56 ++++ .../common/enums/PregnancyMethodEnums.java | 2 +- .../java/com/lyms/platform/beans/SerialIdEnum.java | 4 +- .../com/lyms/platform/pojo/ChargeRecordModel.java | 100 +++++++ .../com/lyms/platform/pojo/HealthChargeModel.java | 144 ++++++++++ .../com/lyms/platform/query/ChargeRecordQuery.java | 188 +++++++++++++ .../com/lyms/platform/query/HealthChargeQuery.java | 202 ++++++++++++++ .../java/com/lyms/platform/operate/web/Test.java | 4 + .../web/controller/HealthChargeController.java | 143 ++++++++++ .../operate/web/facade/HealthChargeFacade.java | 308 +++++++++++++++++++++ .../web/inteceptor/TokenValidateInteceptor.java | 19 -- .../operate/web/request/HealthChargeRequest.java | 101 +++++++ .../web/service/impl/BloodPressureServiceImpl.java | 4 +- 18 files changed, 1427 insertions(+), 24 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IChargeRecordDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IHealthChargeDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ChargeRecordDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/HealthChargeDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ChargeRecordService.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/HealthChargeService.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/ChargeRecordModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/HealthChargeModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HealthChargeRequest.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IChargeRecordDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IChargeRecordDao.java new file mode 100644 index 0000000..468b55d --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IChargeRecordDao.java @@ -0,0 +1,20 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.ChargeRecordModel; + +import java.util.List; + +/** + * Created by Administrator on 2019-03-29. + */ +public interface IChargeRecordDao { + public int queryChargeRecordListCount(MongoQuery mongoQuery); + + public List queryChargeRecordList(MongoQuery mongoQuery); + + public void addChargeRecord(ChargeRecordModel model); + + public void updateChargeRecord(MongoQuery query, ChargeRecordModel model); + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IHealthChargeDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IHealthChargeDao.java new file mode 100644 index 0000000..7c38e35 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IHealthChargeDao.java @@ -0,0 +1,21 @@ +package com.lyms.platform.biz.dal; + + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.HealthChargeModel; + +import java.util.List; + +/** + * Created by Administrator on 2016/6/21 0021. + */ +public interface IHealthChargeDao { + + int queryHealthChargeListCount(MongoQuery mongoQuery); + + List queryHealthChargeList(MongoQuery mongoQuery); + + void addHealthCharge(HealthChargeModel model); + + void updateHealthCharge(MongoQuery query, HealthChargeModel model); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ChargeRecordDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ChargeRecordDaoImpl.java new file mode 100644 index 0000000..e564731 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ChargeRecordDaoImpl.java @@ -0,0 +1,40 @@ +package com.lyms.platform.biz.dal.impl; + + +import com.lyms.platform.biz.dal.IChargeRecordDao; +import com.lyms.platform.biz.dal.IHealthChargeDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.ChargeRecordModel; +import com.lyms.platform.pojo.HealthChargeModel; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + + */ +@Repository("chargeRecordDao") +public class ChargeRecordDaoImpl extends BaseMongoDAOImpl implements IChargeRecordDao { + + @Override + public int queryChargeRecordListCount(MongoQuery mongoQuery) { + return (int)count(mongoQuery.convertToMongoQuery()); + } + + @Override + public List queryChargeRecordList(MongoQuery mongoQuery) { + return find(mongoQuery.convertToMongoQuery()); + } + + @Override + public void addChargeRecord(ChargeRecordModel model) { + save(model); + } + + @Override + public void updateChargeRecord(MongoQuery query, ChargeRecordModel model) { + update(query.convertToMongoQuery(), model); + } + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/HealthChargeDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/HealthChargeDaoImpl.java new file mode 100644 index 0000000..110aaed --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/HealthChargeDaoImpl.java @@ -0,0 +1,40 @@ +package com.lyms.platform.biz.dal.impl; + + +import com.lyms.platform.biz.dal.IHealthChargeDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.HealthChargeModel; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + + */ +@Repository("healthChargeDao") +public class HealthChargeDaoImpl extends BaseMongoDAOImpl implements IHealthChargeDao { + + @Override + public int queryHealthChargeListCount(MongoQuery mongoQuery) { + return (int)count(mongoQuery.convertToMongoQuery()); + } + + @Override + public List queryHealthChargeList(MongoQuery mongoQuery) { + return find(mongoQuery.convertToMongoQuery()); + } + + @Override + public void addHealthCharge(HealthChargeModel model) { + save(model); + } + + @Override + public void updateHealthCharge(MongoQuery query, HealthChargeModel model) { + update(query.convertToMongoQuery(), model); + } + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ChargeRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ChargeRecordService.java new file mode 100644 index 0000000..2e5ebf3 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ChargeRecordService.java @@ -0,0 +1,55 @@ +package com.lyms.platform.biz.service; + + +import com.lyms.platform.biz.dal.IChargeRecordDao; +import com.lyms.platform.biz.dal.IHealthChargeDao; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.ChargeRecordModel; +import com.lyms.platform.pojo.HealthChargeModel; +import com.lyms.platform.query.ChargeRecordQuery; +import com.lyms.platform.query.HealthChargeQuery; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class ChargeRecordService { + + @Autowired + private IChargeRecordDao chargeRecordDao; + + public List queryChargeRecordList(ChargeRecordQuery chargeRecordQuery) { + + MongoQuery query = chargeRecordQuery.convertToQuery(); + if (StringUtils.isNotEmpty(chargeRecordQuery.getNeed())) { + chargeRecordQuery.mysqlBuild(chargeRecordDao.queryChargeRecordListCount(chargeRecordQuery.convertToQuery())); + query.start(chargeRecordQuery.getOffset()).end(chargeRecordQuery.getLimit()); + } + return chargeRecordDao.queryChargeRecordList(query.addOrder(Sort.Direction.DESC, "created")); + } + + + public int queryChargeRecordCount(ChargeRecordQuery chargeRecordQuery) { + return chargeRecordDao.queryChargeRecordListCount(chargeRecordQuery.convertToQuery()); + } + + + public void addChargeRecord(ChargeRecordModel model) { + chargeRecordDao.addChargeRecord(model); + } + + public void updateChargeRecord(ChargeRecordModel model) { + chargeRecordDao.updateChargeRecord(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model); + } + + + + + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/HealthChargeService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/HealthChargeService.java new file mode 100644 index 0000000..0ca5012 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/HealthChargeService.java @@ -0,0 +1,56 @@ +package com.lyms.platform.biz.service; + + +import com.lyms.platform.biz.dal.IHealthChargeDao; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.CourseModel; +import com.lyms.platform.pojo.HealthChargeModel; +import com.lyms.platform.query.CourseQuery; +import com.lyms.platform.query.HealthChargeQuery; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class HealthChargeService { + + @Autowired + private IHealthChargeDao healthChargeDao; + + public List queryHealthChargeList(HealthChargeQuery healthChargeQuery) { + + MongoQuery query = healthChargeQuery.convertToQuery(); + if (StringUtils.isNotEmpty(healthChargeQuery.getNeed())) { + healthChargeQuery.mysqlBuild(healthChargeDao.queryHealthChargeListCount(healthChargeQuery.convertToQuery())); + query.start(healthChargeQuery.getOffset()).end(healthChargeQuery.getLimit()); + } + return healthChargeDao.queryHealthChargeList(query.addOrder(Sort.Direction.DESC, "created")); + } + + + public int queryHealthChargeCount(HealthChargeQuery healthChargeQuery) { + return healthChargeDao.queryHealthChargeListCount(healthChargeQuery.convertToQuery()); + } + + + public void addHealthCharge(HealthChargeModel model) { + healthChargeDao.addHealthCharge(model); + } + + public void updateHealthCharge(HealthChargeModel model) { + healthChargeDao.updateHealthCharge(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model); + } + + public void updateHealthCharges(HealthChargeQuery healthChargeQuery,HealthChargeModel model) { + healthChargeDao.updateHealthCharge(healthChargeQuery.convertToQuery(), model); + } + + + +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyMethodEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyMethodEnums.java index 7c25375..b7281f1 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyMethodEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyMethodEnums.java @@ -14,7 +14,7 @@ import java.util.Map; */ public enum PregnancyMethodEnums { - RSSY(1,"妊娠实验"),BC(2,"B超"),FKJC(3,"妇科检查"); + RSSY(1,"妊娠试验"),BC(2,"B超"),FKJC(3,"妇科检查"); private PregnancyMethodEnums(int id, String name) { this.id = id; diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index a7aa9e0..d80d0a0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -80,13 +80,13 @@ public enum SerialIdEnum { BabySieveModel("BabySieveModel", 97531049991L), PostpartumRecords("PostpartumRecords", 97521049991L), QuestionModel("QuestionModel", 97521049991L), + HealthChargeModel("HealthChargeModel", 97221049991L), + ChargeRecordModel("ChargeRecordModel", 98221049991L), TemporaryWeightModel("TemporaryWeightModel", 97531049591L), BabyEyeCheck("BabyEyeCheck", 97521039591L); - private String cname; private Long cid; - private SerialIdEnum(String cname, Long cid) { this.cid = cid; this.cname = cname; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ChargeRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ChargeRecordModel.java new file mode 100644 index 0000000..383f43a --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ChargeRecordModel.java @@ -0,0 +1,100 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * 健康结算管理管理 + */ +@Document(collection = "lyms_charge_record") +public class ChargeRecordModel extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.ChargeRecordModel.getCid(); + + private String id; + + //医院id + private String hospitalId; + + // 1体重 2 血糖 3 血压 + private Integer healthType; + + private Date startDate; + + private Date endDate; + + private Date created; + + //操作人id + private String operateUserId; + + //结算记录数 + private Integer chargeCount; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getOperateUserId() { + return operateUserId; + } + + public void setOperateUserId(String operateUserId) { + this.operateUserId = operateUserId; + } + + public Integer getChargeCount() { + return chargeCount; + } + + public void setChargeCount(Integer chargeCount) { + this.chargeCount = chargeCount; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/HealthChargeModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/HealthChargeModel.java new file mode 100644 index 0000000..2764f27 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/HealthChargeModel.java @@ -0,0 +1,144 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * 健康打印收费管理 + */ +@Document(collection = "lyms_health_charge") +public class HealthChargeModel extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.HealthChargeModel.getCid(); + + private String id; + + private Integer yn; + + //医院id + private String hospitalId; + + // 1体重 2 血糖 3 血压 + private Integer healthType; + + //建档id或者临时档案id + private String foreignId; + + //打印报告等级 + private Integer type; + + private Date created; + + private Date modified; + + //档案来源类型 1院内建档 2零时建档 + private Integer source; + + //操作人id + private String operateUserId; + + //结算记录id + private String chargeRecordId; + + //结算状态 1未结算 2结算 + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getChargeRecordId() { + return chargeRecordId; + } + + public void setChargeRecordId(String chargeRecordId) { + this.chargeRecordId = chargeRecordId; + } + + public String getOperateUserId() { + return operateUserId; + } + + public void setOperateUserId(String operateUserId) { + this.operateUserId = operateUserId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Integer getSource() { + return source; + } + + public void setSource(Integer source) { + this.source = source; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java new file mode 100644 index 0000000..41383cf --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java @@ -0,0 +1,188 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import org.springframework.data.mongodb.core.query.Criteria; + +import java.util.Date; + +/** + * Created by Administrator on 2016/6/21 0021. + */ +public class ChargeRecordQuery extends BaseQuery implements IConvertToNativeQuery { + + + private String id; + + private Integer yn; + + //医院id + private String hospitalId; + + // 1体重 2 血糖 3 血压 + private Integer healthType; + + //建档id或者临时档案id + private Integer foreignId; + + //打印报告等级 + private Integer type; + + private String operateUserId; + + //档案来源类型 1院内建档 2零时建档 + private Integer source; + + private Date createdStart; + private Date createdEnd; + + + //结算状态 + private Integer status; + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + if (null != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + if (null != id) { + condition = condition.and("id", id, MongoOper.IS); + } + + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } + + if (null != healthType) { + condition = condition.and("healthType", healthType, MongoOper.IS); + } + + if (null != foreignId) { + condition = condition.and("foreignId", foreignId, MongoOper.IS); + } + + if (null != type) { + condition = condition.and("type", type, MongoOper.IS); + } + + if (null != operateUserId) { + condition = condition.and("operateUserId", operateUserId, MongoOper.IS); + } + if (null != status) { + condition = condition.and("status", status, MongoOper.IS); + } + + if (null != source) { + condition = condition.and("source", source, MongoOper.IS); + } + + Criteria c = null; + + if (null != createdStart && createdEnd != null) { + if (null != c) { + c = c.where("created").gte(createdStart).lte(createdEnd); + } else { + c = Criteria.where("created").gte(createdStart).lte(createdEnd); + } + } + + if (null != c) { + condition = condition.andCondition(new MongoCondition(c)); + } + return condition.toMongoQuery(); + } + + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + + public Integer getForeignId() { + return foreignId; + } + + public void setForeignId(Integer foreignId) { + this.foreignId = foreignId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getOperateUserId() { + return operateUserId; + } + + public void setOperateUserId(String operateUserId) { + this.operateUserId = operateUserId; + } + + public Integer getSource() { + return source; + } + + public void setSource(Integer source) { + this.source = source; + } + + public Date getCreatedStart() { + return createdStart; + } + + public void setCreatedStart(Date createdStart) { + this.createdStart = createdStart; + } + + public Date getCreatedEnd() { + return createdEnd; + } + + public void setCreatedEnd(Date createdEnd) { + this.createdEnd = createdEnd; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java new file mode 100644 index 0000000..2e05c2b --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java @@ -0,0 +1,202 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.data.mongodb.core.query.Criteria; + +import java.util.Date; +import java.util.List; + +/** + * Created by Administrator on 2016/6/21 0021. + */ +public class HealthChargeQuery extends BaseQuery implements IConvertToNativeQuery { + + + private String id; + + private Integer yn; + + //医院id + private String hospitalId; + + // 1体重 2 血糖 3 血压 + private Integer healthType; + + //建档id或者临时档案id + private String foreignId; + + //打印报告等级 + private Integer type; + + private String operateUserId; + + //档案来源类型 1院内建档 2零时建档 + private Integer source; + + private Date createdStart; + private Date createdEnd; + + + //结算记录id + private String chargeRecordId; + //结算状态 + private Integer status; + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + if (null != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + if (null != id) { + condition = condition.and("id", id, MongoOper.IS); + } + + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } + if (null != chargeRecordId) { + condition = condition.and("chargeRecordId", hospitalId, MongoOper.IS); + } + + if (null != healthType) { + condition = condition.and("healthType", healthType, MongoOper.IS); + } + + if (null != foreignId) { + condition = condition.and("foreignId", foreignId, MongoOper.IS); + } + + if (null != type) { + condition = condition.and("type", type, MongoOper.IS); + } + + if (null != operateUserId) { + condition = condition.and("operateUserId", operateUserId, MongoOper.IS); + } + if (null != status) { + condition = condition.and("status", status, MongoOper.IS); + } + + if (null != source) { + condition = condition.and("source", source, MongoOper.IS); + } + + Criteria c = null; + + if (null != createdStart && createdEnd != null) { + if (null != c) { + c = c.where("created").gte(createdStart).lte(createdEnd); + } else { + c = Criteria.where("created").gte(createdStart).lte(createdEnd); + } + } + + if (null != c) { + condition = condition.andCondition(new MongoCondition(c)); + } + return condition.toMongoQuery(); + } + + public String getChargeRecordId() { + return chargeRecordId; + } + + public void setChargeRecordId(String chargeRecordId) { + this.chargeRecordId = chargeRecordId; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getOperateUserId() { + return operateUserId; + } + + public void setOperateUserId(String operateUserId) { + this.operateUserId = operateUserId; + } + + public Integer getSource() { + return source; + } + + public void setSource(Integer source) { + this.source = source; + } + + public Date getCreatedStart() { + return createdStart; + } + + public void setCreatedStart(Date createdStart) { + this.createdStart = createdStart; + } + + public Date getCreatedEnd() { + return createdEnd; + } + + public void setCreatedEnd(Date createdEnd) { + this.createdEnd = createdEnd; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 8d308e7..e694078 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -4,6 +4,7 @@ import com.lyms.platform.pojo.BasicConfig; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.log4j.Logger; +import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -17,6 +18,7 @@ public class Test { private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE"); public static void main(String[] args) throws Exception { + } @@ -76,3 +78,5 @@ public class Test { } } } + + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java new file mode 100644 index 0000000..b843acc --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HealthChargeController.java @@ -0,0 +1,143 @@ +package com.lyms.platform.operate.web.controller; + + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.BabyCheckFacade; +import com.lyms.platform.operate.web.facade.HealthChargeFacade; +import com.lyms.platform.operate.web.request.BabyCheckRequest; +import com.lyms.platform.operate.web.request.HealthChargeRequest; +import com.lyms.platform.operate.web.request.RiskPatientsCountRequest; +import com.lyms.platform.permission.service.CouponService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + + +/** + * 健康管理中的收费管理 + */ +@Controller +public class HealthChargeController extends BaseController{ + + + @Autowired + private HealthChargeFacade healthChargeFacade; + + + /** + * 添加 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addHealthCharge") + @ResponseBody + @TokenRequired + public BaseResponse addHealthCharge(@Valid @RequestBody HealthChargeRequest request, + HttpServletRequest httpServletRequest) { + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + + BaseResponse baseResponse = healthChargeFacade.addHealthCharge(request,loginState.getId()); + return baseResponse; + } + + /** + * 列表 + * @param healthType + * @param hospitalId + * @param httpServletRequest + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getHealthCharges",produces = {"application/xml; charset=UTF-8"}) + @ResponseBody + @TokenRequired + public BaseResponse getHealthCharges(@RequestParam(required = true) Integer healthType, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String time, + @RequestParam(required = false) Integer source, + @RequestParam(required = false) Integer status, + @RequestParam(required = false) Integer type, + @RequestParam(required = true) Integer page, + @RequestParam(required = true) Integer limit, + HttpServletRequest httpServletRequest) { + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + + BaseResponse baseResponse =healthChargeFacade.getHealthCharges(healthType, hospitalId, time, source, status, type, page, limit, loginState.getId()); + return baseResponse; + } + + /** + *结算 + * @param healthType + * @param hospitalId + * @param httpServletRequest + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/setHealthCharged") + @ResponseBody + @TokenRequired + public BaseResponse setHealthCharged(@RequestParam(required = true) Integer healthType, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String time, + @RequestParam(required = false) Integer source, + @RequestParam(required = false) Integer status, + @RequestParam(required = false) Integer type, + HttpServletRequest httpServletRequest) { + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + + BaseResponse baseResponse =healthChargeFacade.setHealthCharged(healthType, hospitalId, time, source, status, type, loginState.getId()); + return baseResponse; + } + + + /** + * 结算列表 + * @param healthType + * @param hospitalId + * @param time + * @param httpServletRequest + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getChargeRecords") + @ResponseBody + @TokenRequired + public BaseResponse getChargeRecords(@RequestParam(required = true) Integer healthType, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String time, + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer limit, + @RequestParam(required = false) String doctorId, + HttpServletRequest httpServletRequest) { + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + + BaseResponse baseResponse = healthChargeFacade.getChargeRecords(healthType, hospitalId, time, doctorId, page, limit, loginState.getId()); + return baseResponse; + } + + /** + * 导出 + * @param id + * @param request + * @param response + */ + @RequestMapping(method = RequestMethod.GET, value = "/exportChargeRecords") + @TokenRequired + public void exportChargeRecords(@RequestParam(required = true) String id, + HttpServletRequest request, + HttpServletResponse response) { + healthChargeFacade.exportChargeRecords(id + , response); + } + + +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java new file mode 100644 index 0000000..0806f05 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java @@ -0,0 +1,308 @@ +package com.lyms.platform.operate.web.facade; + +import com.lyms.platform.biz.service.ChargeRecordService; +import com.lyms.platform.biz.service.HealthChargeService; +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.ExcelUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.HealthChargeRequest; +import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.ChargeRecordModel; +import com.lyms.platform.pojo.HealthChargeModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.ChargeRecordQuery; +import com.lyms.platform.query.HealthChargeQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletResponse; +import java.io.OutputStream; +import java.util.*; + +/** + * Created by Administrator on 2019-03-28. + */ +@Component +public class HealthChargeFacade { + + @Autowired + private HealthChargeService healthChargeService; + + + @Autowired + private ChargeRecordService chargeRecordService; + + @Autowired + private PatientsService patientsService; + + @Autowired + private UsersService usersService; + + /** + * 打印体重、血糖、血压调用接口 + * @param hospitalId 医院id + * @param healthType 打印类型 1体重 2 血糖 3 血压 + * @param foreignId 档案id （院内建档或者临时档案id） + * @param type 打印报告类别 1普通报告 2高危报告 + * @param source 档案来源类型 1院内建档 2零时建档 + * @param userId 当前登陆用户id + * @return + */ + public BaseResponse addHealthCharge(String hospitalId,Integer healthType,String foreignId,Integer type,Integer source, Integer userId) + { + HealthChargeRequest request = new HealthChargeRequest(); + request.setHospitalId(hospitalId); + request.setHealthType(healthType); + request.setForeignId(foreignId); + request.setType(type); + request.setSource(source); + return addHealthCharge(request, userId); + } + + + /** + * 添加 + * @param request + * @param userId + * @return + */ + public BaseResponse addHealthCharge(HealthChargeRequest request, Integer userId) { + + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + healthChargeQuery.setForeignId(request.getForeignId()); + healthChargeQuery.setHealthType(request.getHealthType()); + healthChargeQuery.setSource(request.getSource()); + List list = healthChargeService.queryHealthChargeList(healthChargeQuery); + + boolean isSave = false; + if (CollectionUtils.isNotEmpty(list)) + { + HealthChargeModel model = list.get(0); + + if (DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCreated()))) + { + model.setModified(new Date()); + healthChargeService.updateHealthCharge(model); + } + else + { + isSave = true; + } + } + else + { + isSave = true; + } + if (isSave) + { + HealthChargeModel model = request.convertToDataModel(); + model.setStatus(1); + model.setOperateUserId(String.valueOf(userId)); + model.setCreated(new Date()); + model.setModified(new Date()); + model.setYn(YnEnums.YES.getId()); + healthChargeService.addHealthCharge(model); + } + + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse getHealthCharges(Integer healthType, String hospitalId,String time,Integer source,Integer status,Integer type,Integer page,Integer limit,Integer userId) + { + + List listData = new ArrayList<>(); + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + healthChargeQuery.setPage(page); + healthChargeQuery.setLimit(limit); + healthChargeQuery.setNeed("true"); + healthChargeQuery.setHealthType(healthType); + healthChargeQuery.setYn(YnEnums.YES.getId()); + healthChargeQuery.setHospitalId(hospitalId); + healthChargeQuery.setSource(source); + healthChargeQuery.setStatus(status); + healthChargeQuery.setType(type); + if (StringUtils.isNotEmpty(time)) { + String[] dates = time.split(" - "); + healthChargeQuery.setCreatedStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + healthChargeQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } + } + + List list = healthChargeService.queryHealthChargeList(healthChargeQuery); + + if (CollectionUtils.isNotEmpty(list)) + { + + for (HealthChargeModel model : list) + { + Map map = getData(model); + if (map == null) + { + continue; + } + listData.add(map); + } + } + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(listData).setPageInfo(healthChargeQuery.getPageInfo()); + } + + private Map getData(HealthChargeModel model) + { + Map map = new HashMap(); + + if (model.getSource() == 1) + { + Patients patients = patientsService.findOnePatientById(model.getForeignId()); + if (patients == null) + { + return null; + } + map.put("userName", patients.getUsername()); + map.put("age",DateUtil.getAge(patients.getBirth(), model.getCreated())); + map.put("week",patients.getType() == 3 ? "已分娩": DateUtil.getWeekDesc(patients.getLastMenses(),model.getCreated())); + } + else + { + + } + + + map.put("type",model.getType() == 1 ? "标准报告" : "高危报告"); + map.put("source",model.getSource() == 1 ? "院内" : "临时"); + map.put("time", DateUtil.getyyyy_MM_dd(model.getCreated())); + return map; + } + + public BaseResponse setHealthCharged(Integer healthType, String hospitalId, String time, Integer source, Integer status, Integer type, Integer userId) + { + + ChargeRecordModel recordModel = new ChargeRecordModel(); + + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + healthChargeQuery.setHealthType(healthType); + healthChargeQuery.setYn(YnEnums.YES.getId()); + healthChargeQuery.setHospitalId(hospitalId); + healthChargeQuery.setSource(source); + healthChargeQuery.setStatus(status); + healthChargeQuery.setType(type); + if (StringUtils.isNotEmpty(time)) + { + String[] dates = time.split(" - "); + healthChargeQuery.setCreatedStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) + { + healthChargeQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } + + recordModel.setStartDate(DateUtil.parseYMD(dates[0])); + recordModel.setEndDate(DateUtil.parseYMD(dates[1])); + } + + int chargeCount = healthChargeService.queryHealthChargeCount(healthChargeQuery); + + recordModel.setOperateUserId(String.valueOf(userId)); + recordModel.setHealthType(healthType); + recordModel.setCreated(new Date()); + recordModel.setHospitalId(hospitalId); + recordModel.setChargeCount(chargeCount); + recordModel.setCreated(new Date()); + + chargeRecordService.addChargeRecord(recordModel); + + + + HealthChargeModel model = new HealthChargeModel(); + model.setChargeRecordId(recordModel.getId()); + model.setStatus(2); + healthChargeService.updateHealthCharges(healthChargeQuery,model); + + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse getChargeRecords(Integer healthType, String hospitalId, String time, String doctorId, Integer page, Integer limit, Integer userId) + { + List listData = new ArrayList<>(); + ChargeRecordQuery chargeRecordQuery = new ChargeRecordQuery(); + chargeRecordQuery.setHealthType(healthType); + chargeRecordQuery.setHospitalId(hospitalId); + chargeRecordQuery.setOperateUserId(doctorId); + chargeRecordQuery.setPage(page); + chargeRecordQuery.setLimit(limit); + chargeRecordQuery.setNeed("true"); + if (StringUtils.isNotEmpty(time)) + { + String[] dates = time.split(" - "); + chargeRecordQuery.setCreatedStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) + { + chargeRecordQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } + } + List list = chargeRecordService.queryChargeRecordList(chargeRecordQuery); + if (CollectionUtils.isNotEmpty(list)) + { + for (ChargeRecordModel model : list) + { + Map map = new HashMap(); + map.put("id",model.getId()); + map.put("startDate",DateUtil.getyyyy_MM_dd(model.getStartDate())); + map.put("endDate",DateUtil.getyyyy_MM_dd(model.getEndDate())); + map.put("chargeCount",model.getChargeCount()); + map.put("doctorName",usersService.getUsers(Integer.parseInt(model.getOperateUserId())).getName()); + map.put("created",DateUtil.getyyyy_MM_dd(model.getCreated())); + listData.add(map); + } + } + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(listData).setPageInfo(chargeRecordQuery.getPageInfo()); + } + + /** + * 导出 + * @param id + * @param response + */ + public void exportChargeRecords(String id, HttpServletResponse response) + { + + try { + List> listData = new ArrayList<>(); + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + healthChargeQuery.setChargeRecordId(id); + List list = healthChargeService.queryHealthChargeList(healthChargeQuery); + if (CollectionUtils.isNotEmpty(list)) + { + + for (HealthChargeModel model : list) + { + Map map = getData(model); + listData.add(map); + } + } + + OutputStream out = response.getOutputStream(); + Map cnames = new LinkedHashMap<>(); + cnames.put("userName", "姓名"); + cnames.put("age", "年龄"); + cnames.put("week", "孕周"); + cnames.put("type", "报告类型"); + cnames.put("source", "数据来源"); + cnames.put("time", "结款时间"); + response.setContentType("application/octet-stream"); + response.setCharacterEncoding("UTF-8"); + response.setHeader("Content-Disposition", "attachment;fileName=data.xls"); + ExcelUtil.toExcel(out, listData, cnames); + } + catch (Exception e) + { + e.printStackTrace(); + } + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java index b92eb94..54fcd50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java @@ -5,10 +5,8 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.ContextHolder; import com.lyms.platform.common.base.LoginContext; -import com.lyms.platform.common.exception.ForbiddenException; import com.lyms.platform.common.exception.TokenException; import com.lyms.platform.common.utils.LogUtil; -import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.operate.web.session.SessionProvider; import com.lyms.platform.permission.service.UsersService; import org.apache.commons.lang.StringUtils; @@ -32,9 +30,6 @@ import java.lang.annotation.Annotation; */ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { - public static final String XT_VERSION = PropertiesUtils.getPropertyValue("xt_version"); - - @Autowired private SessionProvider sessionProvider; @@ -45,20 +40,6 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - if (XT_VERSION != null && XT_VERSION.equals("xt_version")) - { - String referer = request.getHeader("Referer"); - String url = request.getRequestURL().toString(); - if (StringUtils.isNotEmpty(referer) && !referer.contains("area-xtrm.healthbaby.com.cn")) - { - throw new ForbiddenException(); - } - else if (StringUtils.isNotEmpty(url) && !url.contains("area-xtrm-api.healthbaby.com.cn")) - { - throw new ForbiddenException(); - } - } - if (!isSiteController(handler)) return true; TokenRequired clientRequired = findAnnotation((HandlerMethod) handler, TokenRequired.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HealthChargeRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HealthChargeRequest.java new file mode 100644 index 0000000..1993fdb --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HealthChargeRequest.java @@ -0,0 +1,101 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.pojo.HealthChargeModel; + + + +/** + */ +public class HealthChargeRequest implements IBasicRequestConvert { + + + private String id; + + private String yn; + + //医院id + private String hospitalId; + + // 1体重 2 血糖 3 血压 + private Integer healthType; + + //建档id或者临时档案id + private String foreignId; + + //打印报告类别 1普通报告 2高危报告 + private Integer type; + + + //档案来源类型 1院内建档 2零时建档 + private Integer source; + + @Override + public HealthChargeModel convertToDataModel() { + HealthChargeModel model = new HealthChargeModel(); + model.setId(id); + model.setHospitalId(hospitalId); + model.setHealthType(healthType); + model.setForeignId(foreignId); + model.setType(type); + model.setSource(source); + return model; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getYn() { + return yn; + } + + public void setYn(String yn) { + this.yn = yn; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + + public Integer getSource() { + return source; + } + + public void setSource(Integer source) { + this.source = source; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index b6904f3..641ab64 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -329,7 +329,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP @Override public Map getAppInfo(String parentId) { List bloodPressure = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId)), BloodPressure.class); - List> restList = new ArrayList<>(); + List> restList = new LinkedList<>(); int count = 0; if (CollectionUtils.isNotEmpty(bloodPressure)) { for (BloodPressure b : bloodPressure) { @@ -349,7 +349,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } } } - CollectionUtils.sortListByMapKeyWithDate(restList, "createTime"); +// CollectionUtils.sortListByMapKeyWithDate(restList, "createTime"); Map map = new HashMap<>(); map.put("restList", restList); map.put("excetionCount", count); -- 1.8.3.1