Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -248,7 +248,11 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 }
                 ypZyPatient.setOrderDate(yzYpZyOrder.getOccTime());
                 ypZyPatient.setSectionCode("");
-                ypZyPatient.setAcctSign(yzYpZyOrder.getAmount()==0?"2":"0");
+                if(yzYpZyOrder.getPageClass().equals("A")){
+                    ypZyPatient.setAcctSign("2");
+                }else{
+                    ypZyPatient.setAcctSign(yzYpZyOrder.getAmount()==0?"2":"0");
+                }
                 ypZyPatient.setOutSeri(i+1);
                 ypZyPatient.setKeeper(userCode);
                 ypZyPatient.setTotalFlag("");