From 2a3c7b51b530c58e9585547928a04107e37e28fe Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 11 Jul 2019 10:51:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/IBloodOxygenDao.java | 16 +++ .../platform/biz/dal/impl/BloodOxygenDaoImpl.java | 30 ++++ .../platform/biz/service/BloodOxygenService.java | 38 +++++ .../lyms/platform/common/enums/FmTypeEnums.java | 6 +- .../java/com/lyms/platform/beans/SerialIdEnum.java | 1 + .../com/lyms/platform/pojo/BloodOxygenModel.java | 159 +++++++++++++++++++++ .../com/lyms/platform/query/BloodOxygenQuery.java | 83 +++++++++++ .../java/com/lyms/platform/operate/web/Test.java | 25 ++-- .../web/controller/BloodOxygenController.java | 65 +++++++++ .../web/controller/MatDeliverController.java | 9 ++ .../operate/web/facade/BloodOxygenFacade.java | 133 +++++++++++++++++ .../operate/web/facade/MatDeliverFacade.java | 8 +- .../operate/web/request/BloodOxygenRequest.java | 157 ++++++++++++++++++++ .../web/result/ChildbirthManagerQueryModel.java | 20 +++ .../web/result/NewBabyManagerQueryModel.java | 22 +++ .../operate/web/worker/MatDeliverWorker.java | 4 +- .../operate/web/worker/MaterDeliverWorker.java | 29 ++-- 17 files changed, 777 insertions(+), 28 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBloodOxygenDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BloodOxygenDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodOxygenService.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/BloodOxygenQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodOxygenController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBloodOxygenDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBloodOxygenDao.java new file mode 100644 index 0000000..800bbb0 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBloodOxygenDao.java @@ -0,0 +1,16 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.BloodOxygenModel; + +import java.util.List; + +/** + * Created by Administrator on 2019-07-08. + */ +public interface IBloodOxygenDao { + void addBloodOxygen(BloodOxygenModel model); + public List queryBloodOxygen(MongoQuery query); + + public int queryBloodOxygenCount(MongoQuery mongoQuery); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BloodOxygenDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BloodOxygenDaoImpl.java new file mode 100644 index 0000000..862620b --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BloodOxygenDaoImpl.java @@ -0,0 +1,30 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IBloodOxygenDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.BloodOxygenModel; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * Created by Administrator on 2019-07-08. + */ +@Repository("bloodOxygenDao") +public class BloodOxygenDaoImpl extends BaseMongoDAOImpl implements IBloodOxygenDao { + @Override + public void addBloodOxygen(BloodOxygenModel model) { + save(model); + } + + @Override + public List queryBloodOxygen(MongoQuery query) { + return find(query.convertToMongoQuery()); + } + + @Override + public int queryBloodOxygenCount(MongoQuery mongoQuery) { + return (int) count(mongoQuery.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodOxygenService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodOxygenService.java new file mode 100644 index 0000000..7829708 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodOxygenService.java @@ -0,0 +1,38 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.IBloodOxygenDao; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.BloodOxygenModel; +import com.lyms.platform.query.BloodOxygenQuery; +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; + +/** + * Created by Administrator on 2019-07-08. + */ +@Service +public class BloodOxygenService { + + + @Autowired + private IBloodOxygenDao bloodOxygenDao; + + public void addBloodOxygen(BloodOxygenModel model) { + + bloodOxygenDao.addBloodOxygen(model); + } + + public List queryBloodOxygen(BloodOxygenQuery bloodOxygenQuery) { + + MongoQuery query = bloodOxygenQuery.convertToQuery(); + if (StringUtils.isNotEmpty(bloodOxygenQuery.getNeed())) { + bloodOxygenQuery.mysqlBuild(bloodOxygenDao.queryBloodOxygenCount(bloodOxygenQuery.convertToQuery())); + query.start(bloodOxygenQuery.getOffset()).end(bloodOxygenQuery.getLimit()); + } + return bloodOxygenDao.queryBloodOxygen(query.addOrder(Sort.Direction.DESC, "created")); + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java index 01cab44..dc62107 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java @@ -196,9 +196,9 @@ public enum FmTypeEnums { O3("产钳中位", "4"), O4("臀位助产", "5"), O5("臀位牵引", "6"), - O6("胎吸", "7"), - O7("自由体位", "8"), - O8("臀牵引", "9"); + //O6("胎吸", "7"), + O7("自由体位", "8"); + // O8("臀牵引", "9"); private FmScEnums(String name,String id) { 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 1cf13d3..daf57bc 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 @@ -81,6 +81,7 @@ public enum SerialIdEnum { PostpartumRecords("PostpartumRecords", 97521049991L), QuestionModel("QuestionModel", 97521049991L), HealthChargeModel("HealthChargeModel", 97221049991L), + BloodOxygenModel("BloodOxygenModel", 97121049991L), ChargeRecordModel("ChargeRecordModel", 98221049991L), TemporaryWeightModel("TemporaryWeightModel", 97531049591L), TemporaryBloodModel("TemporaryBloodModel", 97541049591L), diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java new file mode 100644 index 0000000..b1b56f9 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java @@ -0,0 +1,159 @@ +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; + +/** + * 血氧值 + * Created by Administrator on 2016/6/22. + */ +@Document(collection = "lyms_blood_oxygen") +public class BloodOxygenModel extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.BloodOxygenModel.getCid(); + + private String id; + + //血氧饱和度 + private String bloodOxygenSaturation; + + //脉搏 + private String pulse; + + //灌注指数 + private String perfusion; + + //血氧饱和度异常 + private String bloodOxygenSaturationExc; + + //脉搏异常 + private String pulseExc; + + //灌注指数异常 + private String perfusionExc; + + private String hospitalId; + + //孕妇档案id + private String patientId; + + private String pId; + + private Date created; + + private Date modified; + + public String getBloodOxygenSaturationExc() { + return bloodOxygenSaturationExc; + } + + public void setBloodOxygenSaturationExc(String bloodOxygenSaturationExc) { + this.bloodOxygenSaturationExc = bloodOxygenSaturationExc; + } + + public String getPulseExc() { + return pulseExc; + } + + public void setPulseExc(String pulseExc) { + this.pulseExc = pulseExc; + } + + public String getPerfusionExc() { + return perfusionExc; + } + + public void setPerfusionExc(String perfusionExc) { + this.perfusionExc = perfusionExc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBloodOxygenSaturation() { + return bloodOxygenSaturation; + } + + public void setBloodOxygenSaturation(String bloodOxygenSaturation) { + this.bloodOxygenSaturation = bloodOxygenSaturation; + } + + public String getPulse() { + return pulse; + } + + public void setPulse(String pulse) { + this.pulse = pulse; + } + + public String getPerfusion() { + return perfusion; + } + + public void setPerfusion(String perfusion) { + this.perfusion = perfusion; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + 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; + } + + @Override + public String toString() { + return "BloodOxygenModel{" + + "id='" + id + '\'' + + ", bloodOxygenSaturation='" + bloodOxygenSaturation + '\'' + + ", pulse='" + pulse + '\'' + + ", perfusion='" + perfusion + '\'' + + ", hospitalId='" + hospitalId + '\'' + + ", patientId='" + patientId + '\'' + + ", pId='" + pId + '\'' + + ", created=" + created + + ", modified=" + modified + + '}'; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BloodOxygenQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BloodOxygenQuery.java new file mode 100644 index 0000000..cdf5688 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/BloodOxygenQuery.java @@ -0,0 +1,83 @@ +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; +import java.util.List; + +/** + * 新生儿筛查模型 + * Created by Administrator on 2018/8/27. + */ +public class BloodOxygenQuery extends BaseQuery implements IConvertToNativeQuery { + + private String id; + + + private String hospitalId; + + //孕妇档案id + private String patientId; + + private String pId; + + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + if(null != id){ + condition = condition.and("id", id, MongoOper.IS); + } + + if(null != hospitalId){ + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } + + if(null != patientId){ + condition = condition.and("patientId", patientId, MongoOper.IS); + } + + if(null != pId){ + condition = condition.and("pId", pId, MongoOper.IS); + } + + return condition.toMongoQuery(); + } + + + 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 String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } +} 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 bc5e905..beb8394 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 @@ -14,16 +14,21 @@ public class Test { private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE"); public static void main(String[] args) throws Exception { - - Map map = new HashMap(); - map.put("111", "bbb"); - System.out.println(map); - - int h = 0; - Object key = "111"; - int hash = (key == null) ? 0 : (h = key.hashCode()) ^ (h >>> 16); - int i = (16 - 1) & hash; - System.out.print(i); + int MAXIMUM_CAPACITY = 1 << 30; + int n = 11 - 1; + n |= n >>> 1; + n |= n >>> 2; + n |= n >>> 4; + n |= n >>> 8; + n |= n >>> 16; + int a = (n < 0) ? 1 : (n >= MAXIMUM_CAPACITY) ? MAXIMUM_CAPACITY : n + 1; + System.out.println(a); + + LinkedHashMap map = new LinkedHashMap<>(); + + map.put("a","A"); + map.put("b","B"); + map.put("c","C"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodOxygenController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodOxygenController.java new file mode 100644 index 0000000..03e22be --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodOxygenController.java @@ -0,0 +1,65 @@ +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.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.BabyNutritionFacade; +import com.lyms.platform.operate.web.facade.BloodOxygenFacade; +import com.lyms.platform.operate.web.request.BabyNutritionRequest; +import com.lyms.platform.operate.web.request.BabyNutritionSettleRequest; +import com.lyms.platform.operate.web.request.BloodOxygenRequest; +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; +import java.util.Calendar; +import java.util.Date; + + +/** + * 血氧 + */ +@Controller +public class BloodOxygenController extends BaseController { + + + @Autowired + private BloodOxygenFacade bloodOxygenFacade; + + + /** + * 添加血氧 + * + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addBloodOxygen") + @ResponseBody + public BaseResponse addBloodOxygen(@Valid @RequestBody BloodOxygenRequest request, + HttpServletRequest httpServletRequest) { + + return bloodOxygenFacade.addBloodOxygen(request); + } + + + /** + * 获取血氧记录 + * @param patientId + * @param httpServletRequest + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBloodOxygen") + @ResponseBody + public BaseResponse getBloodOxygen(@RequestParam(required = true)String patientId ,HttpServletRequest httpServletRequest) { + + return bloodOxygenFacade.getBloodOxygen(patientId); + } + + + +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 300c2cb..5c3460d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -352,6 +352,9 @@ public class MatDeliverController extends BaseController { @RequestMapping(value = "newBabyManagerExcel", method = RequestMethod.POST) public void newBabyManagerExcel(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest, HttpServletResponse httpServletResponse) { try { + + String hospitalId = autoMatchFacade.getHospitalId(getUserId(httpServletRequest)); + newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); newBabyManagerRequest.setExcel(true); // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 @@ -388,6 +391,11 @@ public class MatDeliverController extends BaseController { } } + if ("2100001635".equals(hospitalId)) + { + map.put("mphone",newBabyManagerQueryModel.getNoEphone()); + } + Integer deformity = newBabyManagerQueryModel.getDeformity(); map.put("jx", deformity == null ? "" : (deformity == 1 ? "是" : "否")); @@ -466,6 +474,7 @@ public class MatDeliverController extends BaseController { header.put("cc", "产次"); header.put("ts", "胎数"); header.put("dueType", "分娩方式"); + header.put("operationCause", "手术原因"); header.put("fmWeek", "分娩孕周"); header.put("jx", "外观是否正常"); header.put("deliverDoctor", "接生医生"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java new file mode 100644 index 0000000..d35cec2 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java @@ -0,0 +1,133 @@ +package com.lyms.platform.operate.web.facade; + +import com.lyms.platform.biz.service.BloodOxygenService; +import com.lyms.platform.biz.service.PatientsService; +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.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.BloodOxygenRequest; +import com.lyms.platform.permission.dao.master.MasterLisMapper; +import com.lyms.platform.permission.model.LisReportItemModel; +import com.lyms.platform.permission.model.LisReportModel; +import com.lyms.platform.pojo.BloodOxygenModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.BloodOxygenQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.*; + +/** + * Created by Administrator on 2019-07-08. + */ +@Component +public class BloodOxygenFacade { + + @Autowired + private PatientsService patientsService; + + @Autowired + private MasterLisMapper masterLisMapper; + + @Autowired + private BloodOxygenService bloodOxygenService; + + public BaseResponse addBloodOxygen(BloodOxygenRequest request) { + + if (StringUtils.isNotEmpty(request.getPatientId())) + { + Patients patient = patientsService.findOnePatientById(request.getPatientId()); + if (patient != null) + { + BloodOxygenModel model = request.convertToDataModel(); + model.setModified(new Date()); + model.setCreated(new Date()); + request.setHospitalId(patient.getHospitalId()); + request.setpId(patient.getPid()); + bloodOxygenService.addBloodOxygen(model); + + LisReportModel lisModel = new LisReportModel(); + String uuid = StringUtils.uuid(); + lisModel.setType("血氧"); + lisModel.setLisId(uuid); + lisModel.setSex("女"); + lisModel.setCheckTime(new Date()); + lisModel.setApplyTime(new Date()); + lisModel.setPublishTime(new Date()); + lisModel.setModified(new Date()); + lisModel.setCreated(new Date()); + lisModel.setStatus(0); + lisModel.setName(patient.getUsername()); + lisModel.setAge(DateUtil.getAge(patient.getBirth()) + ""); + lisModel.setHospitalId(patient.getHospitalId()); + lisModel.setVcCardNo(patient.getVcCardNo()); + lisModel.setPhone(patient.getPhone()); + lisModel.setTitle("孕妇期血氧监测报告"); + + List items = new ArrayList<>(); + LisReportItemModel item1 = new LisReportItemModel(); + item1.setHospitalId(patient.getHospitalId()); + item1.setCharResult(request.getBloodOxygenSaturation()); + item1.setLisId(uuid); + item1.setName("血氧饱和度"); + item1.setPrintOrder("1"); + item1.setUnit("%"); + item1.setResultFlag(request.getBloodOxygenSaturationExc()); + item1.setRef("94%～100%"); + + LisReportItemModel item2 = new LisReportItemModel(); + item2.setHospitalId(patient.getHospitalId()); + item2.setCharResult(request.getPulse()); + item2.setLisId(uuid); + item2.setName("脉搏率"); + item2.setPrintOrder("2"); + item2.setUnit("BPM"); + item2.setResultFlag(request.getPulseExc()); + + LisReportItemModel item3 = new LisReportItemModel(); + item3.setHospitalId(patient.getHospitalId()); + item3.setCharResult(request.getPerfusion()); + item3.setLisId(uuid); + item3.setName("灌注指数"); + item3.setPrintOrder("3"); + item3.setUnit("%"); + item3.setResultFlag(request.getPerfusionExc()); + + items.add(item1); + items.add(item2); + items.add(item3); + + lisModel.setItemJson(JsonUtil.array2JsonString(items)); + masterLisMapper.saveLisData(lisModel); + } + } + + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse getBloodOxygen(String patientId) { + + List datas = new ArrayList<>(); + BloodOxygenQuery query = new BloodOxygenQuery(); + query.setPatientId(patientId); + List list = bloodOxygenService.queryBloodOxygen(query); + if (CollectionUtils.isNotEmpty(list)) + { + for (BloodOxygenModel model : list) + { + Map map = new HashMap(); + map.put("created",DateUtil.getyyyy_MM_dd(model.getCreated())); + map.put("bloodOxygenSaturation",model.getBloodOxygenSaturation()); + map.put("pulse",model.getPulse()); + map.put("perfusion",model.getPerfusion()); + map.put("id",model.getId()); + datas.add(map); + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 560a0d6..0284df5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1,6 +1,5 @@ package com.lyms.platform.operate.web.facade; -import com.alibaba.fastjson.JSONObject; import com.lyms.hospitalapi.lcdcf.LcdcfFmService; import com.lyms.hospitalapi.lcdcf.LcdcfHisModel; import com.lyms.hospitalapi.lcdcf.LcdcfHisService; @@ -34,7 +33,6 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.joda.time.format.ISODateTimeFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -54,8 +52,6 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -2556,6 +2552,8 @@ public class MatDeliverFacade { //newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); // newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth())); newBabyManagerQueryModel.setMphone(DefenceUtils.getPhone(babyModel.getMphone())); + + newBabyManagerQueryModel.setNoEphone(babyModel.getMphone()); newBabyManagerQueryModel.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date())); newBabyManagerQueryModel.setBabyId(babyModel.getId()); String deliverDoctor = ""; @@ -2575,6 +2573,8 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setGravidity(maternalDeliverModel.getGravidity()); newBabyManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount()); + newBabyManagerQueryModel.setOperationCause(maternalDeliverModel.getOperationCause()); + newBabyManagerQueryModel.setFmWeek(maternalDeliverModel.getDueWeek()); for (SexEnum sexEnum : SexEnum.values()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java new file mode 100644 index 0000000..068ef6e --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java @@ -0,0 +1,157 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.pojo.BloodOxygenModel; + +import java.util.Date; + +/** + * Created by Administrator on 2019-07-08. + */ +public class BloodOxygenRequest implements IBasicRequestConvert { + + private String id; + + //血氧饱和度 + private String bloodOxygenSaturation; + + //血氧饱和度异常 + private String bloodOxygenSaturationExc; + + //脉搏 + private String pulse; + + //脉搏异常 + private String pulseExc; + + //灌注指数 + private String perfusion; + + //灌注指数异常 + private String perfusionExc; + + private String hospitalId; + + //孕妇档案id + private String patientId; + + private String pId; + + private Date created; + + private Date modified; + + @Override + public BloodOxygenModel convertToDataModel() { + BloodOxygenModel model = new BloodOxygenModel(); + model.setBloodOxygenSaturation(bloodOxygenSaturation); + model.setPulse(pulse); + model.setPerfusion(perfusion); + + model.setBloodOxygenSaturationExc(bloodOxygenSaturationExc); + model.setPulseExc(pulseExc); + model.setPerfusionExc(perfusionExc); + + model.setHospitalId(hospitalId); + model.setId(id); + model.setpId(pId); + model.setPatientId(patientId); + return model; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBloodOxygenSaturation() { + return bloodOxygenSaturation; + } + + public void setBloodOxygenSaturation(String bloodOxygenSaturation) { + this.bloodOxygenSaturation = bloodOxygenSaturation; + } + + public String getPulse() { + return pulse; + } + + public void setPulse(String pulse) { + this.pulse = pulse; + } + + public String getPerfusion() { + return perfusion; + } + + public void setPerfusion(String perfusion) { + this.perfusion = perfusion; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + 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 String getBloodOxygenSaturationExc() { + return bloodOxygenSaturationExc; + } + + public void setBloodOxygenSaturationExc(String bloodOxygenSaturationExc) { + this.bloodOxygenSaturationExc = bloodOxygenSaturationExc; + } + + public String getPulseExc() { + return pulseExc; + } + + public void setPulseExc(String pulseExc) { + this.pulseExc = pulseExc; + } + + public String getPerfusionExc() { + return perfusionExc; + } + + public void setPerfusionExc(String perfusionExc) { + this.perfusionExc = perfusionExc; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java index 5af540d..044daad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java @@ -428,6 +428,26 @@ public class ChildbirthManagerQueryModel { private String gcStatus;//观察状态（0:正在观察；1:观察完成） private String recordsNum;//记录条数 + private String totalTwoCxl;//阴道分娩产后2小时总出血量 + + private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他 + + public String getBabyQX() { + return babyQX; + } + + public void setBabyQX(String babyQX) { + this.babyQX = babyQX; + } + + public String getTotalTwoCxl() { + return totalTwoCxl; + } + + public void setTotalTwoCxl(String totalTwoCxl) { + this.totalTwoCxl = totalTwoCxl; + } + public String getGcStatus() { return gcStatus; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java index 98465a3..a9ebddb3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java @@ -131,6 +131,8 @@ public class NewBabyManagerQueryModel { */ private String mphone; + private String noEphone; + /** * @auther HuJiaqi * @createTime 2016年12月08日 10时57分 @@ -151,6 +153,26 @@ public class NewBabyManagerQueryModel { //窒息分钟 private String asphyxiaM; + //手术原因 + private String operationCause; + + + public String getNoEphone() { + return noEphone; + } + + public void setNoEphone(String noEphone) { + this.noEphone = noEphone; + } + + public String getOperationCause() { + return operationCause; + } + + public void setOperationCause(String operationCause) { + this.operationCause = operationCause; + } + public String getAsphyxiaM() { return asphyxiaM; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java index 749b3b3..1a220bc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java @@ -170,7 +170,7 @@ public class MatDeliverWorker implements Runnable{ map.put("deliveryMode3", reslult3); map.put("deliveryMode4", reslult4); map.put("deliveryMode5", reslult5); - map.put("thloseBloodL", queryModel.getThloseBloodL() == null ? "" : String.valueOf(queryModel.getThloseBloodL())); + map.put("thloseBloodL", queryModel.getTotalTwoCxl() == null ? "" : String.valueOf(queryModel.getTotalTwoCxl())); map.put("sex", queryModel.getSex()); map.put("height", queryModel.getBabyHeight()); int nu = 0; @@ -253,7 +253,7 @@ public class MatDeliverWorker implements Runnable{ } map.put("department1", department1); map.put("department2", department2); - map.put("remark", patients.getMremark() == null ? "" : patients.getMremark());//备注42列 + map.put("remark", queryModel.getBabyQX());//备注42列 } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index 8ba9fe4..b07d21d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -3,28 +3,20 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; -import com.lyms.platform.operate.web.result.AntExManagerResult; import com.lyms.platform.operate.web.result.ChildbirthManagerQueryModel; import com.lyms.platform.operate.web.utils.CommonsHelper; -import com.lyms.platform.permission.model.Organization; -import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.AntExRecordQuery; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PostpartumRecordsQuery; import com.lyms.platform.query.RecordsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.*; -import org.apache.commons.lang.math.NumberUtils; -import org.springframework.beans.factory.annotation.Autowired; + import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -435,6 +427,25 @@ public class MaterDeliverWorker implements Callable babies = maternalDeliverModel.getBaby(); + String babyQx = ""; + if (babies != null) + { + for (MaternalDeliverModel.Baby baby : babies) + { + //babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他 + if (baby != null && baby.getBabyQX() != null) + { + babyQx = "1".equals(baby.getBabyQX()) ? "病房" : ("2".equals(baby.getBabyQX()) ? "NICU" : "3".equals(baby.getBabyQX()) ? "转院" : baby.getOtherInfo() == null ? "" :baby.getOtherInfo()); + } + } + } + + childbirthManagerQueryModel.setBabyQX(babyQx); + + // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型 if (initQuery.contains("tpmcType") || initQuery.contains("tpSize") || initQuery.contains("tpWeight") || initQuery.contains("umbilicalCordLength") || initQuery.contains("umbilicalCordEx") || initQuery.contains("umbilicalCordExType")) { List extPlacentaList = maternalDeliverModel.getExtPlacentas(); -- 1.8.3.1