|
@@ -151,12 +151,16 @@ public class SetlListUpldService {
|
|
*/
|
|
*/
|
|
public ResultVo<String> upldSetlList(String patNo, Integer times, Integer ledgerSn,boolean checkFlag) throws Exception {
|
|
public ResultVo<String> upldSetlList(String patNo, Integer times, Integer ledgerSn,boolean checkFlag) throws Exception {
|
|
//这里签收表可能没有数据,先效验下病案首页
|
|
//这里签收表可能没有数据,先效验下病案首页
|
|
- ZyInactpatient param = new ZyInactpatient();
|
|
|
|
- param.setInpatientNo(patNo);
|
|
|
|
- param.setAdmissTimes(times);
|
|
|
|
- sheetVerification(param);
|
|
|
|
|
|
+ if(ledgerSn != 0){
|
|
|
|
+ ZyInactpatient param = new ZyInactpatient();
|
|
|
|
+ param.setInpatientNo(patNo);
|
|
|
|
+ param.setAdmissTimes(times);
|
|
|
|
+ sheetVerification(param);
|
|
|
|
+ }
|
|
ResultVo<UpldCollection> upldCollection = getUploadInfo(patNo, times, ledgerSn);
|
|
ResultVo<UpldCollection> upldCollection = getUploadInfo(patNo, times, ledgerSn);
|
|
- dealDrgGroup(patNo,times,ledgerSn,upldCollection.getData().getSetlinfo());
|
|
|
|
|
|
+ if(ledgerSn != 0) {
|
|
|
|
+ dealDrgGroup(patNo,times,ledgerSn,upldCollection.getData().getSetlinfo());
|
|
|
|
+ }
|
|
if(checkFlag){
|
|
if(checkFlag){
|
|
checkUploadCondition(patNo, upldCollection,times);
|
|
checkUploadCondition(patNo, upldCollection,times);
|
|
}
|
|
}
|