fangcheng / regional-platform

Download as
Browse Code »

Commit b147361f014523643e47d022456ed23a0afc0b00

Authored by hujiaqi
2 parents 2a3ae3c961 d870bea329
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AutoIncermentService.java View file @ b147361
... ... @@ -21,7 +21,7 @@
21 21  
22 22 public String nextPatientTicketId() {
23 23 Integer id = patientTicketIdDao.nextId(Patients.class.getSimpleName());
24   - return String.format("%08d", id);
  24 + return String.format("%07d", id);
25 25 }
26 26  
27 27 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/qinglongxian/QingLongXianHisService.java View file @ b147361
... ... @@ -48,12 +48,25 @@
48 48 }
49 49  
50 50 public List<Map<String,Object>> getPatientInfoList(String cardNo){
  51 +
  52 + String sql = "SELECT '门诊' SICKTYPE, T.BRID SICK_ID, T.XM NAME, CASE WHEN XB = '01' THEN '男' "+
  53 + " WHEN XB = '02' THEN '女' ELSE '未知' END SEX, T.CSRQ BIRTHDATE, S.JZKH IC_CARD_ID, "+
  54 + " N.JZID NULLAH_NUMBER, T.LXR ASSOCIATION_NAME, "+
  55 + " CASE WHEN T.LXRDH IS NULL THEN T.JTDH "+
  56 + " ELSE T.LXRDH END ASSOCIATION_PHONE "+
  57 + " FROM GY_EPMI T "+
  58 + " LEFT JOIN MZYKT_STATUS S "+
  59 + " ON T.BRID = S.BRID "+
  60 + " LEFT JOIN MZYS_JZXX_MAIN N "+
  61 + " ON T.BRID = N.BRID "+
  62 + " WHERE S.ZT = '1' and S.JZKH='"+cardNo+"' ";
51 63 List<Map<String,Object>> result = new ArrayList<>();
52 64 if (StringUtils.isNotBlank(cardNo)) {
53 65 Connection conn = ConnTools.makeHisConnection();
54 66 QueryRunner queryRunner = new QueryRunner();
55 67 try {
56   - List<XinlePregPatientinfo> list = queryRunner.query(conn, "select * from v_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
  68 + // List<XinlePregPatientinfo> list = queryRunner.query(conn, "select * from v_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
  69 + List<XinlePregPatientinfo> list = queryRunner.query(conn, sql, new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
57 70 if (list.size() > 0) {
58 71 for (XinlePregPatientinfo info:list) {
59 72 Map<String,Object> map = new HashMap<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ b147361
... ... @@ -1762,7 +1762,19 @@
1762 1762 if (CollectionUtils.isNotEmpty(list)) {
1763 1763 patients = list.get(0);
1764 1764 }
1765   - } else {
  1765 + } else if(StringUtils.isNotEmpty(queryRequest.getBarCode())){
  1766 + PatientCheckTicket checkTicket =patientCheckTicketService.getTicket(queryRequest.getBarCode());
  1767 + if(null!=checkTicket){
  1768 + Patients patients1 = patientsService.findOnePatientById(checkTicket.getPatientId());
  1769 + if(null!=patients1){
  1770 + if(StringUtils.isNotEmpty(patients1.getSource())){
  1771 + patients= patientsService.findOnePatientById(patients1.getSource());
  1772 + }else{
  1773 + patients=patients1;
  1774 + }
  1775 + }
  1776 + }
  1777 + }else {
1766 1778 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 1, false, null, og.getbStatus() == 1);
1767 1779 //查询产妇数据
1768 1780 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ b147361
... ... @@ -260,7 +260,7 @@
260 260 ticket.setHospitalId(p.getHospitalId());
261 261 ticket.setPatientId(p.getId());
262 262 ticket.setCreated(new Date());
263   - ticket.setId("0335" + ticketPid + String.format("%02d", i));
  263 + ticket.setId("0335" + ticketPid + i);
264 264 patientCheckTicketService.addTicket(ticket);
265 265 }
266 266  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ b147361
... ... @@ -117,6 +117,8 @@
117 117 postReviewModel.setYn(YnEnums.YES.getId());
118 118 postReviewModel.setHospitalId(hospital);
119 119 Patients patients = patientsService.findOnePatientById(postReviewRequest.getParentId());
  120 + patients.setLastCheckEmployeeId(postReviewModel.getProdDoctor());
  121 + patientsService.updatePatient(patients);
120 122 if (StringUtils.isNotEmpty(postReviewRequest.getDueDate())) {
121 123 patients.setFmDate(DateUtil.parseYMD(postReviewRequest.getDueDate()));
122 124 patients.setType(3);
... ... @@ -141,6 +143,7 @@
141 143 patientsService.updatePatient(patients2);
142 144 }
143 145  
  146 + patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(postReviewRequest.getNextCheckTime()));
144 147  
145 148 if (null != patients.getBuildType() && patients.getBuildType() == 3) {
146 149 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java View file @ b147361
... ... @@ -23,6 +23,16 @@
23 23  
24 24 private String patientId;
25 25  
  26 + private String barCode;
  27 +
  28 + public String getBarCode() {
  29 + return barCode;
  30 + }
  31 +
  32 + public void setBarCode(String barCode) {
  33 + this.barCode = barCode;
  34 + }
  35 +
26 36 public String getPatientId() {
27 37 return patientId;
28 38 }