From c07e3346c8e106c7a0591fa801c93e8cd312ca2f Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 25 Apr 2024 14:43:24 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=A4=A7=E5=90=8CRIS?= =?UTF-8?q?=E5=92=8C=E5=88=86=E5=A8=A9=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/model/RisReportModel.java | 266 ++++++++++++--------- .../permission/service/impl/RisServiceImpl.java | 13 +- .../main/resources/mainOrm/master/MasterRis.xml | 46 ++-- .../main/java/com/lyms/platform/pojo/Patients.java | 24 ++ .../operate/web/controller/FmController.java | 1 - .../operate/web/controller/PatientController.java | 33 +++ .../operate/web/controller/RisController.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- .../operate/web/request/HisNewbornRequest.java | 12 +- .../operate/web/service/SyncDataTaskService.java | 1 + 10 files changed, 252 insertions(+), 148 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientController.java diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RisReportModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RisReportModel.java index d8a8150..0bdf73f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RisReportModel.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RisReportModel.java @@ -1,30 +1,31 @@ package com.lyms.platform.permission.model; + public class RisReportModel { private Integer id; - private String R_ID; - private String TITLE; - private String TYPE; - private String VCCARDNO; - private String NAME; - private String PHONE; - private String BHNUM; - private String AGE; - private String SEX; - private String IMGS;//影像图片 - private String ITEM_FINDING;//影像所见 - private String ITEM_DIAGNOSIS;//诊断意见 - private String ITEM_RESULT;//检验结果 - private String APPLY_TIME;//送检日期 - private String CHECK_TIME;//检验时间 - private String PUBLISH_TIME;//报告发布时间 - private String APPLY_DOCTOR;//送检医生 - private String APPLY_DEPT;//送检科室 - private String CHECKER;//检验员 - private String MODIFIED;//最后修改时间 - private String CREATED;//创建时间 - private String HOSPITAL_ID; - private String ITEM_JSON; + private String r_id; + private String title; + private String type; + private String vccardno; + private String name; + private String phone; + private String bhnum; + private String age; + private String sex; + private String imgs;//影像图片 + private String item_finding;//影像所见 + private String item_diagnosis;//诊断意见 + private String item_result;//检验结果 + private String apply_time;//送检日期 + private String check_time;//检验时间 + private String publish_time;//报告发布时间 + private String apply_doctor;//送检医生 + private String apply_dept;//送检科室 + private String checker;//检验员 + private String modified;//最后修改时间 + private String created;//创建时间 + private String hospital_id; + private String item_json; public Integer getId() { @@ -35,187 +36,222 @@ public class RisReportModel { this.id = id; } - public String getR_ID() { - return R_ID; + public String getR_id() { + return r_id; + } + + public void setR_id(String r_id) { + this.r_id = r_id; } - public void setR_ID(String r_ID) { - R_ID = r_ID; + public String getTitle() { + return title; } - public String getTITLE() { - return TITLE; + public void setTitle(String title) { + this.title = title; } - public void setTITLE(String TITLE) { - this.TITLE = TITLE; + public String getType() { + return type; } - public String getTYPE() { - return TYPE; + public void setType(String type) { + this.type = type; } - public void setTYPE(String TYPE) { - this.TYPE = TYPE; + public String getVccardno() { + return vccardno; } - public String getVCCARDNO() { - return VCCARDNO; + public void setVccardno(String vccardno) { + this.vccardno = vccardno; } - public void setVCCARDNO(String VCCARDNO) { - this.VCCARDNO = VCCARDNO; + public String getName() { + return name; } - public String getNAME() { - return NAME; + public void setName(String name) { + this.name = name; } - public void setNAME(String NAME) { - this.NAME = NAME; + public String getPhone() { + return phone; } - public String getPHONE() { - return PHONE; + public void setPhone(String phone) { + this.phone = phone; } - public void setPHONE(String PHONE) { - this.PHONE = PHONE; + public String getBhnum() { + return bhnum; } - public String getBHNUM() { - return BHNUM; + public void setBhnum(String bhnum) { + this.bhnum = bhnum; } - public void setBHNUM(String BHNUM) { - this.BHNUM = BHNUM; + public String getAge() { + return age; } - public String getAGE() { - return AGE; + public void setAge(String age) { + this.age = age; } - public void setAGE(String AGE) { - this.AGE = AGE; + public String getSex() { + return sex; } - public String getSEX() { - return SEX; + public void setSex(String sex) { + this.sex = sex; } - public void setSEX(String SEX) { - this.SEX = SEX; + public String getImgs() { + return imgs; } - public String getIMGS() { - return IMGS; + public void setImgs(String imgs) { + this.imgs = imgs; } - public void setIMGS(String IMGS) { - this.IMGS = IMGS; + public String getItem_finding() { + return item_finding; } - public String getITEM_FINDING() { - return ITEM_FINDING; + public void setItem_finding(String item_finding) { + this.item_finding = item_finding; } - public void setITEM_FINDING(String ITEM_FINDING) { - this.ITEM_FINDING = ITEM_FINDING; + public String getItem_diagnosis() { + return item_diagnosis; } - public String getITEM_DIAGNOSIS() { - return ITEM_DIAGNOSIS; + public void setItem_diagnosis(String item_diagnosis) { + this.item_diagnosis = item_diagnosis; } - public void setITEM_DIAGNOSIS(String ITEM_DIAGNOSIS) { - this.ITEM_DIAGNOSIS = ITEM_DIAGNOSIS; + public String getItem_result() { + return item_result; } - public String getITEM_RESULT() { - return ITEM_RESULT; + public void setItem_result(String item_result) { + this.item_result = item_result; } - public void setITEM_RESULT(String ITEM_RESULT) { - this.ITEM_RESULT = ITEM_RESULT; + public String getApply_time() { + return apply_time; } - public String getAPPLY_TIME() { - return APPLY_TIME; + public void setApply_time(String apply_time) { + this.apply_time = apply_time; } - public void setAPPLY_TIME(String APPLY_TIME) { - this.APPLY_TIME = APPLY_TIME; + public String getCheck_time() { + return check_time; } - public String getCHECK_TIME() { - return CHECK_TIME; + public void setCheck_time(String check_time) { + this.check_time = check_time; } - public void setCHECK_TIME(String CHECK_TIME) { - this.CHECK_TIME = CHECK_TIME; + public String getPublish_time() { + return publish_time; } - public String getPUBLISH_TIME() { - return PUBLISH_TIME; + public void setPublish_time(String publish_time) { + this.publish_time = publish_time; } - public void setPUBLISH_TIME(String PUBLISH_TIME) { - this.PUBLISH_TIME = PUBLISH_TIME; + public String getApply_doctor() { + return apply_doctor; } - public String getAPPLY_DOCTOR() { - return APPLY_DOCTOR; + public void setApply_doctor(String apply_doctor) { + this.apply_doctor = apply_doctor; } - public void setAPPLY_DOCTOR(String APPLY_DOCTOR) { - this.APPLY_DOCTOR = APPLY_DOCTOR; + public String getApply_dept() { + return apply_dept; } - public String getAPPLY_DEPT() { - return APPLY_DEPT; + public void setApply_dept(String apply_dept) { + this.apply_dept = apply_dept; } - public void setAPPLY_DEPT(String APPLY_DEPT) { - this.APPLY_DEPT = APPLY_DEPT; + public String getChecker() { + return checker; } - public String getCHECKER() { - return CHECKER; + public void setChecker(String checker) { + this.checker = checker; } - public void setCHECKER(String CHECKER) { - this.CHECKER = CHECKER; + public String getModified() { + return modified; } - public String getMODIFIED() { - return MODIFIED; + public void setModified(String modified) { + this.modified = modified; } - public void setMODIFIED(String MODIFIED) { - this.MODIFIED = MODIFIED; + public String getCreated() { + return created; } - public String getCREATED() { - return CREATED; + public void setCreated(String created) { + this.created = created; } - public void setCREATED(String CREATED) { - this.CREATED = CREATED; + public String getHospital_id() { + return hospital_id; } - public String getHOSPITAL_ID() { - return HOSPITAL_ID; + public void setHospital_id(String hospital_id) { + this.hospital_id = hospital_id; } - public void setHOSPITAL_ID(String HOSPITAL_ID) { - this.HOSPITAL_ID = HOSPITAL_ID; + public String getItem_json() { + return item_json; } - public String getITEM_JSON() { - return ITEM_JSON; + public void setItem_json(String item_json) { + this.item_json = item_json; } - public void setITEM_JSON(String ITEM_JSON) { - this.ITEM_JSON = ITEM_JSON; + @Override + public String toString() { + return "RisReportModel{" + + "id=" + id + + ", r_id='" + r_id + '\'' + + ", title='" + title + '\'' + + ", type='" + type + '\'' + + ", vccardno='" + vccardno + '\'' + + ", name='" + name + '\'' + + ", phone='" + phone + '\'' + + ", bhnum='" + bhnum + '\'' + + ", age='" + age + '\'' + + ", sex='" + sex + '\'' + + ", imgs='" + imgs + '\'' + + ", item_finding='" + item_finding + '\'' + + ", item_diagnosis='" + item_diagnosis + '\'' + + ", item_result='" + item_result + '\'' + + ", apply_time='" + apply_time + '\'' + + ", check_time='" + check_time + '\'' + + ", publish_time='" + publish_time + '\'' + + ", apply_doctor='" + apply_doctor + '\'' + + ", apply_dept='" + apply_dept + '\'' + + ", checker='" + checker + '\'' + + ", modified='" + modified + '\'' + + ", created='" + created + '\'' + + ", hospital_id='" + hospital_id + '\'' + + ", item_json='" + item_json + '\'' + + '}'; } + + public static void main(String[] args) { + String str="33.00岁 "; + System.out.println(str.trim()+"1111"); + } } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java index 8c4ccd3..0e36875 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java @@ -2,6 +2,8 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.permission.dao.master.MasterLisMapper; import com.lyms.platform.permission.dao.master.MasterRisMapper; import com.lyms.platform.permission.model.LisReportModel; @@ -69,7 +71,16 @@ public class RisServiceImpl implements RisService { try { for (RisReportModel model : lisList) { try { - masterRisMapper.deleteRisData(model); + if (StringUtils.isNotEmpty(model.getItem_json())) + { + model.setItem_json(JsonUtil.array2JsonString(model.getItem_json())); + } + System.out.println(model.getAge().trim()); + model.setAge(model.getAge().trim()); + model.setItem_finding(model.getItem_finding().trim()); + model.setItem_diagnosis(model.getItem_diagnosis().trim()); + System.out.println("resivce = " + model.toString()); + // masterRisMapper.deleteRisData(model); masterRisMapper.saveRisData(model); } catch (Exception e) { continue; diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml index daf3910..cdf2b66 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml @@ -28,29 +28,29 @@ HOSPITAL_ID, ITEM_JSON ) VALUES ( - ${R_ID}, - ${TITLE}, - ${TYPE}, - ${VCCARDNO}, - ${NAME}, - ${BHNUM}, - ${PHONE}, - ${AGE}, - ${SEX}, - ${IMGS}, - ${ITEM_FINDING}, - ${ITEM_DIAGNOSIS}, - ${ITEM_RESULT}, - ${APPLY_TIME}, - ${CHECK_TIME}, - ${PUBLISH_TIME}, - ${APPLY_DOCTOR}, - ${APPLY_DEPT}, - ${CHECKER}, - ${MODIFIED}, - ${CREATED}, - ${HOSPITAL_ID}, - ${ITEM_JSON} + ${r_id}, + ${title}, + ${type}, + ${vccardno}, + ${name}, + ${bhnum}, + ${phone}, + ${age}, + ${sex}, + ${imgs}, + ${item_finding}, + ${item_diagnosis}, + ${item_result}, + ${apply_time}, + ${check_time}, + ${publish_time}, + ${apply_doctor}, + ${apply_dept}, + ${checker}, + ${modified}, + ${created}, + ${hospital_id}, + ${item_json} ) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index fd3d1a9..0c38e53 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -487,6 +487,14 @@ public class Patients extends BaseModel { private String buildingManualCode; private Integer isComplete; + /** + * 大同需求 + */ + //问诊次数 （建档一个月内） + private Integer visitsNum; + //his病人ID + private String patientHId; + public String getVillageId() { return villageId; } @@ -1997,6 +2005,22 @@ public class Patients extends BaseModel { isSendCoupon = sendCoupon; } + public Integer getVisitsNum() { + return visitsNum; + } + + public void setVisitsNum(Integer visitsNum) { + this.visitsNum = visitsNum; + } + + public String getPatientHId() { + return patientHId; + } + + public void setPatientHId(String patientHId) { + this.patientHId = patientHId; + } + public TrackDownRecord build() { TrackDownRecord downRecord = new TrackDownRecord(); downRecord.setParentId(getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java index ca179c0..d50b406 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java @@ -60,5 +60,4 @@ public class FmController { return JsonUtil.array2JsonString(models); } - } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientController.java new file mode 100644 index 0000000..981c28a --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientController.java @@ -0,0 +1,33 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.PatientsQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +@Controller("/patient") +public class PatientController { + @Autowired + private PatientsService patientsService; + //http://112.112.112.183:8085/viewhip-etyy/view/commView/layout.jsp?patientId=病人ID + + @RequestMapping(method = RequestMethod.GET, value = "/getPatients") + @ResponseBody + public BaseResponse getPatients(){ + BaseResponse baseResponse=new BaseResponse(); + PatientsQuery patientsQuery =new PatientsQuery(); + patientsQuery.setYn(1); + patientsQuery.setHospitalId("2100002419"); + List patientsList= patientsService.queryPatient(patientsQuery); + baseResponse.setObject(patientsList); + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RisController.java index 7aee4db..318020c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RisController.java @@ -43,7 +43,7 @@ public class RisController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/saveRisData") @ResponseBody - public BaseResponse saveLisData(@RequestBody List models, + public BaseResponse saveRisData(@RequestBody List models, HttpServletRequest httpServletRequest) { System.out.println("resivce size = " + models.size()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 7aa2bcc..780f2c2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -6877,7 +6877,7 @@ public class BabyBookbuildingFacade { babyDiagnoseModel.setBlh(hisNewbornRequest.getBHNUM()); babyDiagnoseModel.setCyzdmc(hisNewbornRequest.getDIAGNOSE()); babyDiagnoseModel.setLxdh(hisNewbornRequest.getPhone()); - babyDiagnoseModel.setCyrq(hisNewbornRequest.getCreated()); + babyDiagnoseModel.setCyrq(DateUtil.parseYMDHMS(hisNewbornRequest.getCreated())); babyModelQuery.setName(hisNewbornRequest.getName()); List modelList= babyService.queryBabyWithQuery(babyModelQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HisNewbornRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HisNewbornRequest.java index 2822472..0e7fd9e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HisNewbornRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HisNewbornRequest.java @@ -17,9 +17,9 @@ public class HisNewbornRequest { private String DIAGNOSE; //修改时间 - private Date modified; + private String modified; //创建时间 - private Date created; + private String created; public String getId() { return id; @@ -61,19 +61,19 @@ public class HisNewbornRequest { this.DIAGNOSE = DIAGNOSE; } - public Date getModified() { + public String getModified() { return modified; } - public void setModified(Date modified) { + public void setModified(String modified) { this.modified = modified; } - public Date getCreated() { + public String getCreated() { return created; } - public void setCreated(Date created) { + public void setCreated(String created) { this.created = created; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 24d826e..426eb4e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -60,6 +60,7 @@ public class SyncDataTaskService { //urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); //urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼"); urls.put("area-chengde-api.healthbaby.com.cn:12356","承德"); + urls.put("area-dt-api.healthbaby.com.cn:12356","大同"); //urls.put("area-lingcheng-api.healthbaby.com.cn:12356","陵城"); } -- 1.8.3.1