|
@@ -2068,7 +2068,15 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
mzZyReq.setIcdText(mzZyReq.getIcdTextNew().substring(0, 20));
|
|
|
}
|
|
|
if (StringUtils.isBlank(mzZyReq.getIcdText())) {
|
|
|
- mzZyReq.setIcdText(mzPrescriptionVo.getMzBlRecord().getTentativeDiagnosis());
|
|
|
+ if(StringUtils.isNotBlank(mzPrescriptionVo.getMzBlRecord().getTentativeDiagnosis())){
|
|
|
+ mzZyReq.setIcdTextNew(mzPrescriptionVo.getMzBlRecord().getTentativeDiagnosis());
|
|
|
+ mzZyReq.setIcdText(mzPrescriptionVo.getMzBlRecord().getTentativeDiagnosis());
|
|
|
+ if(mzPrescriptionVo.getMzBlRecord().getTentativeDiagnosis().length()>25){
|
|
|
+ mzZyReq.setIcdText(mzZyReq.getIcdTextNew().substring(0, 20));
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
if (mzZyReq.getIcdCode() == null) {
|
|
|
mzZyReq.setIcdCode("");
|
|
@@ -2456,6 +2464,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
if (mzVisitTable != null && mzVisitTable.getIcdText() != null && StringUtils.isNotBlank(mzVisitTable.getIcdText())) {
|
|
|
icdText += mzVisitTable.getIcdText();
|
|
|
}
|
|
|
+ //诊断太长导致处方分页
|
|
|
+ if(icdText.length()>60){
|
|
|
+ icdText=icdText.substring(0,60);
|
|
|
+ }
|
|
|
mzPrescriptionVo.setIcdText(icdText);
|
|
|
mzPrescriptionVo.setMzBlRecord(mzBlRecord);
|
|
|
if (mzBlRecord.getEmrProcess() != null && mzBlRecord.getEmrProcess().indexOf("收住院") >= 0) {
|