jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 089b4cde17f83d074301261cd8a6df09508097dd

Authored by zhangchao
1 parent 2a591085c8
Exists in dev

#fix:优化建档页面产检医生

Showing 7 changed files with 101 additions and 70 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 089b4cd
... ... @@ -524,7 +524,16 @@
524 524 private Integer isArchive;
525 525 //病历号(住院号)
526 526 private String blNo;
  527 + //大同his同步分娩建档数据 不给护士及门诊展示 住院用 默认为0
  528 + private Integer dtFm;
527 529  
  530 + public Integer getDtFm() {
  531 + return dtFm;
  532 + }
  533 +
  534 + public void setDtFm(Integer dtFm) {
  535 + this.dtFm = dtFm;
  536 + }
528 537  
529 538 public String getBlNo() {
530 539 return blNo;
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 089b4cd
... ... @@ -448,7 +448,17 @@
448 448 //病历号(住院号)
449 449 private String blNo;
450 450  
  451 + //大同his同步分娩建档数据 不给护士及门诊展示 住院用
  452 + private boolean dtFm=false;
451 453  
  454 + public boolean isDtFm() {
  455 + return dtFm;
  456 + }
  457 +
  458 + public void setDtFm(boolean dtFm) {
  459 + this.dtFm = dtFm;
  460 + }
  461 +
452 462 public String getBlNo() {
453 463 return blNo;
454 464 }
... ... @@ -901,7 +911,9 @@
901 911 condition= condition.and("isArchive",0, MongoOper.NE);
902 912 }
903 913  
904   -
  914 + if (dtFm){
  915 + condition= condition.and("dtFm",0, MongoOper.NE);
  916 + }
905 917  
906 918 if (extSource != null) {
907 919 condition = condition.and("source", extSource, MongoOper.EXISTS);
platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java View file @ 089b4cd
... ... @@ -118,7 +118,7 @@
118 118 patient.setBuildType(2);
119 119 patient.setDueStatus(0);
120 120 patient.setBlNo(allFm.getBhnum());
121   - patient.setDeliverDoctor(String.valueOf(users.get(0).getId()));
  121 + // patient.setDeliverDoctor(String.valueOf(users.get(0).getId()));
122 122 patient.setModified(new Date());
123 123 patientsService.updatePatientOne(patient,patient.getId());
124 124 } else{
125 125  
... ... @@ -152,10 +152,11 @@
152 152 patient.setOperator(users.get(0).getId());
153 153 patient.setLastMenses(DateUtil.getWeekDay(allFm.getDue_WEEK().length()>2?-Integer.valueOf(allFm.getDue_WEEK().substring(0,2)):-Integer.valueOf(allFm.getDue_WEEK())));
154 154 patient.setBirth(DateUtil.parseYMD(DateUtil.getBirthFromIdCard(allFm.getIdcard())));
155   - patient.setDeliverDoctor(String.valueOf(users.get(0).getId()));
  155 + //patient.setDeliverDoctor(String.valueOf(users.get(0).getId()));
156 156 patient.setCreated(new Date());
157 157 patient.setModified(new Date());
158 158 patient.setBlNo(allFm.getBhnum());
  159 + patient.setDtFm(0);
159 160 patient=patientsService.addPatient(patient);
160 161 }else {
161 162 System.out.println("no idCardNo in database："+ allFm.toString());
... ... @@ -300,7 +301,7 @@
300 301 for (int i = 0; i < allFm.getFetus_NUM() ; i++) {
301 302 //儿童
302 303 MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
303   - baby.setBabyWeight(allFm.getBaby_WEIGHT() == null ? null : allFm.getBaby_WEIGHT().toString());
  304 + // baby.setBabyWeight(allFm.getBaby_WEIGHT() == null ? null : allFm.getBaby_WEIGHT().toString());
304 305 Map <String, String> as = new HashMap <>();
305 306 String pf1 = String.valueOf(allFm.getBaby_APGAR_SCORE_ONE());
306 307 String pf5 = String.valueOf(allFm.getBaby_APGAR_SCORE_FIVE());
... ... @@ -318,8 +319,8 @@
318 319  
319 320 baby.setApgarScore(as);
320 321 baby.setBabyGender("男".equals(allFm.getBaby_SEX().trim()) ? "1" : "0");
321   - String babyHeight = String.valueOf(allFm.getBaby_HEIGHT());
322   - String babyWeight = String.valueOf(allFm.getBaby_WEIGHT());
  322 + String babyHeight = String.valueOf(allFm.getBaby_HEIGHT()).trim();
  323 + String babyWeight = String.valueOf(allFm.getBaby_WEIGHT()).trim();
323 324 Integer baby_Asphyxiam = allFm.getBaby_ASPHYXIAM();
324 325 if (babyHeight != null) {
325 326 baby.setBabyHeight(babyHeight);//新生儿生长
326 327  
... ... @@ -333,13 +334,13 @@
333 334  
334 335 baby.setDeformity((allFm.getBaby_DEFORMITY() != null ? allFm.getBaby_DEFORMITY() : 0)); //畸形 0非畸形 1畸形
335 336  
336   - String baby_Pregnancy_Out = allFm.getBaby_PREGNANCY_OUT().trim()=="1"?"活产":"";
  337 + String baby_Pregnancy_Out = "1".equals(allFm.getBaby_PREGNANCY_OUT().trim())?"活产":"";
337 338 if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
338 339 baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局
339 340 }
340 341  
341 342 // System.out.println("7-------------" + allFm.getBABY_PREGNANCY_OUT() == "1" ? "活产" : "");
342   - baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局
  343 + //baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局
343 344  
344 345 baby.setDueTime(DateUtil.getyyyy_MM_dd_hms(dueDate));//分娩时间
345 346 babies.add(baby);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 089b4cd
... ... @@ -396,37 +396,38 @@
396 396 patient.setScreening(yunRequest.getScreening());//特殊产筛建档
397 397  
398 398 //如果建档医生是空则创建医生
399   - if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) {
  399 + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId()) || StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) {
  400 + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) {
  401 + Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName().trim());
  402 + if (dockerId != null) {
  403 + patient.setLastCheckEmployeeId(String.valueOf(dockerId));
  404 + } else {
  405 + //准备添加数据
  406 + Users users = new Users();
  407 + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
  408 + //users.setDeptId(deptId);
  409 + users.setOrgId(Integer.valueOf(patient.getHospitalId()));
  410 + users.setName(yunRequest.getLastCheckEmployeeName().trim());
  411 + users.setAccount(yunRequest.getLastCheckEmployeeName().trim());
  412 + //users.setPhone(phone);
  413 + users.setEnable(1);
  414 + // users.setZhiChenId(zhiCId);
  415 + users.setPwd(MD5Utils.md5("123456").toUpperCase());
  416 + //users.setRemarks(remarks);
  417 + // users.setKsId(ksId);
  418 + // users.setPublishId(user.getId());
  419 + // users.setPublishName(user.getName());
  420 + users.setYn(YnEnums.YES.getId());
  421 + users.setModified(new Date());
  422 + users.setCreated(new Date());
  423 + // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
  424 + // user.setDefaultPage(defaultPage);
  425 + usersService.addUsers(users);
  426 + patient.setLastCheckEmployeeId(String.valueOf(users.getId()));
  427 + }
400 428  
401   - Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName().trim());
402   - if (dockerId != null) {
403   - patient.setLastCheckEmployeeId(String.valueOf(dockerId));
404   - } else {
405   - if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) {
406   - //准备添加数据
407   - Users users = new Users();
408   - users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
409   - //users.setDeptId(deptId);
410   - users.setOrgId(Integer.valueOf(patient.getHospitalId()));
411   - users.setName(yunRequest.getLastCheckEmployeeName().trim());
412   - users.setAccount(yunRequest.getLastCheckEmployeeName().trim());
413   - //users.setPhone(phone);
414   - users.setEnable(1);
415   - // users.setZhiChenId(zhiCId);
416   - users.setPwd(MD5Utils.md5("123456").toUpperCase());
417   - //users.setRemarks(remarks);
418   - // users.setKsId(ksId);
419   - // users.setPublishId(user.getId());
420   - // users.setPublishName(user.getName());
421   - users.setYn(YnEnums.YES.getId());
422   - users.setModified(new Date());
423   - users.setCreated(new Date());
424   - // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
425   - // user.setDefaultPage(defaultPage);
426   - usersService.addUsers(users);
427   - patient.setLastCheckEmployeeId(String.valueOf(users.getId()));
428   - }
429   -
  429 + }else if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId())){
  430 + patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId());
430 431 }
431 432 }
432 433  
433 434  
... ... @@ -1922,39 +1923,40 @@
1922 1923 }*/
1923 1924  
1924 1925 //如果建档医生是空则创建医生
1925   - if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) {
1926   -
1927   - Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName().trim());
1928   - if (dockerId != null) {
1929   - patient.setLastCheckEmployeeId(String.valueOf(dockerId));
1930   - } else {
1931   - if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) {
1932   - //准备添加数据
1933   - Users users = new Users();
1934   - users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
1935   - //users.setDeptId(deptId);
1936   - users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId()) ? patient.getHospitalId() : hospitalId));
1937   - users.setName(yunRequest.getLastCheckEmployeeName().trim());
1938   - users.setAccount(yunRequest.getLastCheckEmployeeName().trim());
1939   - //users.setPhone(phone);
1940   - users.setEnable(1);
1941   - // users.setZhiChenId(zhiCId);
1942   - users.setPwd(MD5Utils.md5("123456").toUpperCase());
1943   - //users.setRemarks(remarks);
1944   - // users.setKsId(ksId);
1945   - // users.setPublishId(user.getId());
1946   - // users.setPublishName(user.getName());
1947   - users.setYn(YnEnums.YES.getId());
1948   - users.setModified(new Date());
1949   - users.setCreated(new Date());
1950   - // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
1951   - // user.setDefaultPage(defaultPage);
1952   - usersService.addUsers(users);
1953   - patient.setLastCheckEmployeeId(String.valueOf(users.getId()));
1954   - }
1955   -
  1926 + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId()) || StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) {
  1927 + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) {
  1928 + Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName().trim());
  1929 + if (dockerId != null) {
  1930 + patient.setLastCheckEmployeeId(String.valueOf(dockerId));
  1931 + } else {
  1932 + //准备添加数据
  1933 + Users users = new Users();
  1934 + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
  1935 + //users.setDeptId(deptId);
  1936 + users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId()) ? patient.getHospitalId() : hospitalId));
  1937 + users.setName(yunRequest.getLastCheckEmployeeName().trim());
  1938 + users.setAccount(yunRequest.getLastCheckEmployeeName().trim());
  1939 + //users.setPhone(phone);
  1940 + users.setEnable(1);
  1941 + // users.setZhiChenId(zhiCId);
  1942 + users.setPwd(MD5Utils.md5("123456").toUpperCase());
  1943 + //users.setRemarks(remarks);
  1944 + // users.setKsId(ksId);
  1945 + // users.setPublishId(user.getId());
  1946 + // users.setPublishName(user.getName());
  1947 + users.setYn(YnEnums.YES.getId());
  1948 + users.setModified(new Date());
  1949 + users.setCreated(new Date());
  1950 + // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
  1951 + // user.setDefaultPage(defaultPage);
  1952 + usersService.addUsers(users);
  1953 + patient.setLastCheckEmployeeId(String.valueOf(users.getId()));
  1954 + }
  1955 + } else if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId())){
  1956 + patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId());
1956 1957 }
1957 1958 }
  1959 +
1958 1960  
1959 1961 patient.setOperator(userId);
1960 1962 patient.setScreening(yunRequest.getScreening());//特殊产筛建档
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 089b4cd
... ... @@ -230,7 +230,12 @@
230 230 return new BaseResponse().setErrormsg("操作进行中，请勿重复操作").setErrorcode(ErrorCodeConstants.DATA_EXIST);
231 231 }
232 232 lockMap.put(deliverAddRequest.getParentId(), 1);
233   - String hospitalId = autoMatchFacade.getHospitalId(userId);
  233 + //大同特殊处理 如果userId为空 默认为大同
  234 + String hospitalId ="2100002419";
  235 + if (userId!=null){
  236 + hospitalId = autoMatchFacade.getHospitalId(userId);
  237 + }
  238 +
234 239  
235 240 //秦皇岛市山海关人民医院 零时处理
236 241 // if (CollectionUtils.isNotEmpty(deliverAddRequest.getBabies()) && "1000000004".equals(hospitalId)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 089b4cd
... ... @@ -3210,6 +3210,7 @@
3210 3210 patientsQuery.setBooksuifangDoctor(patientManagerRequest.getBooksuifangDoctor());
3211 3211 if ("2100002419".equals(hospitalId)){
3212 3212 patientsQuery.setArchive(true);
  3213 + patientsQuery.setDtFm(true);
3213 3214 }
3214 3215 //孕产建档管理-初诊医生 是否 条件查询
3215 3216 if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 089b4cd
... ... @@ -1617,6 +1617,7 @@
1617 1617 patientsQuery.setLimit(statisticsQueryRequest.getLimit());
1618 1618 if ("2100002419".equals(hospitalId)){
1619 1619 patientsQuery.setArchive(true);
  1620 + patientsQuery.setDtFm(true);
1620 1621 }
1621 1622 if (StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())) {
1622 1623 String time = statisticsQueryRequest.getDueDate();