|
@@ -2132,15 +2132,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
mzPrescriptionVo.setMzYjReqList(mzYjReqs);
|
|
|
if(mzBlRecord!=null){
|
|
|
mzBlRecord.setTimes(times);
|
|
|
- if(mzBlRecord.getWeight()==null){
|
|
|
- mzBlRecord.setWeight(0D);
|
|
|
- }
|
|
|
- if(mzBlRecord.getTemperature()==null){
|
|
|
- mzBlRecord.setTemperature(0D);
|
|
|
- }
|
|
|
- if(mzBlRecord.getTentativeDiagnosis()==null){
|
|
|
- mzBlRecord.setTentativeDiagnosis("");
|
|
|
- }
|
|
|
+ setBlRecord(mzBlRecord);
|
|
|
mzPrescriptionVo.setMzBlRecord(mzBlRecord);
|
|
|
setPrescriptionDetail(mzPrescriptionVo, YesNoEnum.NO);
|
|
|
mzBlRecordMapper.insertMzBlRecord(mzBlRecord);
|
|
@@ -2152,6 +2144,70 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
return times;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 去空
|
|
|
+ * @param mzBlRecord
|
|
|
+ */
|
|
|
+ private void setBlRecord(MzBlRecord mzBlRecord) {
|
|
|
+ if(mzBlRecord.getWeight()==null){
|
|
|
+ mzBlRecord.setWeight(0D);
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getTemperature()==null){
|
|
|
+ mzBlRecord.setTemperature(0D);
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrChiefComplaint()==null){
|
|
|
+ mzBlRecord.setEmrChiefComplaint("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrHpi()==null){
|
|
|
+ mzBlRecord.setEmrHpi("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrPs()==null){
|
|
|
+ mzBlRecord.setEmrPs("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrPe()==null){
|
|
|
+ mzBlRecord.setEmrPe("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrFzjc()==null){
|
|
|
+ mzBlRecord.setEmrFzjc("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrBzfx()==null){
|
|
|
+ mzBlRecord.setEmrBzfx("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getDiseases()==null){
|
|
|
+ mzBlRecord.setDiseases("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getTentativeDiagnosis()==null){
|
|
|
+ mzBlRecord.setTentativeDiagnosis("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrXyy()==null){
|
|
|
+ mzBlRecord.setEmrXyy("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrYypg()==null){
|
|
|
+ mzBlRecord.setEmrYypg("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrGnpg()==null){
|
|
|
+ mzBlRecord.setEmrGnpg("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrJkjy()==null){
|
|
|
+ mzBlRecord.setEmrJkjy("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getPersonalHistory()==null){
|
|
|
+ mzBlRecord.setPersonalHistory("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getFamilyHistory()==null){
|
|
|
+ mzBlRecord.setFamilyHistory("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getObstericalHistory()==null){
|
|
|
+ mzBlRecord.setObstericalHistory("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getPrescriptionDetail()==null){
|
|
|
+ mzBlRecord.setPrescriptionDetail("");
|
|
|
+ }
|
|
|
+ if(mzBlRecord.getEmrProcess()==null){
|
|
|
+ mzBlRecord.setEmrProcess("");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private List<MzReceiptSerial> formatRefundReceiptSerial(List<MzReceiptSerial> mzReceiptSerials, String opId) {
|
|
|
Set<String> tempSet = new HashSet<>();
|
|
|
List<MzReceiptSerial> newReceiptSerials = new ArrayList<>();
|