jiangs/transitPlatForm
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

修改BUG

Browse Source
This commit is contained in:
jiangs 2026-03-24 12:02:03 +08:00
parent 002f2555a2
commit 284b283bf1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java
View File

@ -127,6 +127,8 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
regApply.setCreate_by(regApply.getUserCode()); regApply.setCreate_by(regApply.getUserCode());
regApply.setCreate_time(commonUtil.getCurrentTime()); regApply.setCreate_time(commonUtil.getCurrentTime());
regApply.setOrderTime(commonUtil.getCurrentTime()); regApply.setOrderTime(commonUtil.getCurrentTime());
regApply.setSrcHospCode(SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJG());
regApply.setSrcHospName(SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJGName());
//病人生日 //病人生日
Date birthDayFromAge = LisUtil.getBirthDayFromAge(Integer.parseInt(regApply.getPatAge()), regApply.getAgeUnit()); Date birthDayFromAge = LisUtil.getBirthDayFromAge(Integer.parseInt(regApply.getPatAge()), regApply.getAgeUnit());
@ -239,7 +241,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
reqSqdInfo.put("sample_PatId", regApply.getPatId()); reqSqdInfo.put("sample_PatId", regApply.getPatId());
reqSqdInfo.put("sample_PatCardType", regApply.getPatCardType()); reqSqdInfo.put("sample_PatCardType", regApply.getPatCardType());
reqSqdInfo.put("sample_PatCardNo", regApply.getPatCardNo()); reqSqdInfo.put("sample_PatCardNo", regApply.getPatCardNo());
reqSqdInfo.put("sample_PatType",regApply.getPatType());//regApply.getPatType() 这里条码的病人来源，需要根据医院的需求修改 reqSqdInfo.put("sample_PatType",regApply.getPatType());
reqSqdInfo.put("sample_RegNo", regApply.getRegNo()); reqSqdInfo.put("sample_RegNo", regApply.getRegNo());
reqSqdInfo.put("sample_PatName", regApply.getPatName()); reqSqdInfo.put("sample_PatName", regApply.getPatName());
reqSqdInfo.put("sample_PatSex", regApply.getPatSex()); reqSqdInfo.put("sample_PatSex", regApply.getPatSex());
@ -290,7 +292,14 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
public int compare(Map<String, Object> o1, Map<String, Object> o2) { public int compare(Map<String, Object> o1, Map<String, Object> o2) {
String itemClass1 = LisUtil.isBank(o1.get("sample_SrcHospBarcode").toString().trim()); String itemClass1 = LisUtil.isBank(o1.get("sample_SrcHospBarcode").toString().trim());
String itemClass2 = LisUtil.isBank(o2.get("sample_SrcHospBarcode").toString().trim()); String itemClass2 = LisUtil.isBank(o2.get("sample_SrcHospBarcode").toString().trim());
return itemClass1.compareTo(itemClass2); int i = itemClass1.compareTo(itemClass2);
if(i == 0){
String sampleSampleTypeName1 = LisUtil.isBank(o1.get("sample_SampleTypeName").toString().trim());
String sampleSampleTypeName2 = LisUtil.isBank(o2.get("sample_SampleTypeName").toString().trim());
return sampleSampleTypeName1.compareTo(sampleSampleTypeName2);
}else{
return i;
}
} }
}); });
@ -374,6 +383,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
regTransitSample.setAreaName(LisUtil.isBank(stringObjectMap.get("sample_AreaName"))); regTransitSample.setAreaName(LisUtil.isBank(stringObjectMap.get("sample_AreaName")));
regTransitSample.setPatBed(LisUtil.isBank(stringObjectMap.get("sample_PatBed"))); regTransitSample.setPatBed(LisUtil.isBank(stringObjectMap.get("sample_PatBed")));
regTransitSample.setDiagnosisCode(LisUtil.isBank(stringObjectMap.get("sample_DiagnosisCode"))); regTransitSample.setDiagnosisCode(LisUtil.isBank(stringObjectMap.get("sample_DiagnosisCode")));
regTransitSample.setDiagnosisName(LisUtil.isBank(stringObjectMap.get("sample_DiagnosisName")));
regTransitSample.setOrderUserCode(LisUtil.isBank(stringObjectMap.get("sample_OrderUserCode"))); regTransitSample.setOrderUserCode(LisUtil.isBank(stringObjectMap.get("sample_OrderUserCode")));
regTransitSample.setOrderUserName(LisUtil.isBank(stringObjectMap.get("sample_OrderUserName"))); regTransitSample.setOrderUserName(LisUtil.isBank(stringObjectMap.get("sample_OrderUserName")));
regTransitSample.setOrderTime(DateUtil.parse(LisUtil.isBank(stringObjectMap.get("sample_OrderTime")), "yyyy-MM-dd HH:mm:ss")); regTransitSample.setOrderTime(DateUtil.parse(LisUtil.isBank(stringObjectMap.get("sample_OrderTime")), "yyyy-MM-dd HH:mm:ss"));

1
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
View File

@ -162,6 +162,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
case "100": //标本退回 case "100": //标本退回
if (statusSample.equals("100")) return new Result("0", "该标本已经退回！"); if (statusSample.equals("100")) return new Result("0", "该标本已经退回！");
if (Integer.parseInt(statusSample) < 50) return new Result("-1", barcode+"该标本还未签收，不能退回！"); if (Integer.parseInt(statusSample) < 50) return new Result("-1", barcode+"该标本还未签收，不能退回！");
regTransitSample.setBackReasons(backReasons);
regTransitSample.setBackUserCode(backUserCode); regTransitSample.setBackUserCode(backUserCode);
regTransitSample.setBackUserName(backUserName); regTransitSample.setBackUserName(backUserName);
regTransitSample.setBackTime(commonUtil.getCurrentTime()); regTransitSample.setBackTime(commonUtil.getCurrentTime());