Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManager.java =================================================================== diff -u -r21800 -r21801 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManager.java (.../ExpensiveGoodsApplicationManager.java) (revision 21800) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManager.java (.../ExpensiveGoodsApplicationManager.java) (revision 21801) @@ -2,36 +2,36 @@ import net.sf.json.JSONArray; -import com.forgon.disinfectsystem.entity.expensivegoodsapplication.Expensivegoodsapplication; +import com.forgon.disinfectsystem.entity.expensivegoodsapplication.ExpensiveGoodsApplication; import com.forgon.tools.hibernate.BasePoManager; /** * 高值耗材申请单的业务接口 * @author Chenjiaru 2017-12-29 * */ -public interface ExpensiveGoodsApplicationManager extends BasePoManager { +public interface ExpensiveGoodsApplicationManager extends BasePoManager { /** * 保存或者修改高值耗材申请单. - * @param expensivegoodsapplication 高值耗材申请单对象 + * @param expensiveGoodsApplication 高值耗材申请单对象 * @param commit 是否提交操作 * @param items 此次提交的申请项信息 */ - public void saveOrUpdate(Expensivegoodsapplication expensivegoodsapplication, boolean commit, JSONArray items); + public void saveOrUpdate(ExpensiveGoodsApplication expensiveGoodsApplication, boolean commit, JSONArray items); /** * 修改高值耗材申请单（审批的时候对申请单的一些修改）. - * @param expensivegoodsapplication 高值耗材申请单对象 + * @param expensiveGoodsApplication 高值耗材申请单对象 * @param items 此次提交的申请项 */ public void updateExpensiveGoodsApplicationForApproval( - Expensivegoodsapplication expensivegoodsapplication, JSONArray items); + ExpensiveGoodsApplication expensiveGoodsApplication, JSONArray items); /** * 设置申请单的审批流程的相关信息. - * @param expensivegoodsapplication 高值耗材申请单对象 + * @param expensiveGoodsApplication 高值耗材申请单对象 * @param approval 审批操作 */ - public void updateNodeInfo(Expensivegoodsapplication expensivegoodsapplication, boolean approval); + public void updateNodeInfo(ExpensiveGoodsApplication expensiveGoodsApplication, boolean approval); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java =================================================================== diff -u -r21800 -r21801 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 21800) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 21801) @@ -13,7 +13,7 @@ import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; -import com.forgon.disinfectsystem.entity.expensivegoodsapplication.Expensivegoodsapplication; +import com.forgon.disinfectsystem.entity.expensivegoodsapplication.ExpensiveGoodsApplication; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager; @@ -25,7 +25,7 @@ import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; -public class ExpensiveGoodsApplicationManagerImpl extends BasePoManagerImpl implements +public class ExpensiveGoodsApplicationManagerImpl extends BasePoManagerImpl implements ExpensiveGoodsApplicationManager { private TousseItemManager tousseItemManager; @@ -50,55 +50,55 @@ @Override - public void saveOrUpdate(Expensivegoodsapplication expensivegoodsapplication, boolean commit, JSONArray items) { - String deliverStatus = expensivegoodsapplication.getDeliverStatus(); + public void saveOrUpdate(ExpensiveGoodsApplication expensiveGoodsApplication, boolean commit, JSONArray items) { + String deliverStatus = expensiveGoodsApplication.getDeliverStatus(); if (StringTools.isNotBlank(deliverStatus) && !InvoicePlan.DELIVERSTATUS_AWAITDELIVER.equals(deliverStatus)) { throw new RuntimeException("发货状态必须为待发货才能修改！"); } if (items != null && items.size() > 0) { //1、设置申请项 - setTousseItem(expensivegoodsapplication, items); + setTousseItem(expensiveGoodsApplication, items); //2、设置时间（申请时间的赋值，两种操作需要赋值: 1、“第一次提交” 2、“暂存后的提交” 最好修改时间：无论提交或者暂存都要赋值） Date currentDateTime = new Date(); - if(expensivegoodsapplication.getApplicationTime() == null || (commit && !expensivegoodsapplication.getCommittedStatus())){ - expensivegoodsapplication.setApplicationTime(currentDateTime); + if(expensiveGoodsApplication.getApplicationTime() == null || (commit && !expensiveGoodsApplication.getCommittedStatus())){ + expensiveGoodsApplication.setApplicationTime(currentDateTime); } - expensivegoodsapplication.setSubmitTime(currentDateTime); + expensiveGoodsApplication.setSubmitTime(currentDateTime); //3、设置单类型和状态等等信息 - if (StringUtils.isBlank(expensivegoodsapplication.getSerialNumber())) { - expensivegoodsapplication.setSerialNumber(serialNumManager.getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION)); + if (StringUtils.isBlank(expensiveGoodsApplication.getSerialNumber())) { + expensiveGoodsApplication.setSerialNumber(serialNumManager.getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION)); } - expensivegoodsapplication.setCommittedStatus(commit); - expensivegoodsapplication.setOrderByFiled(InvoicePlan.ORDERBYFIELD_ONE); - expensivegoodsapplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); - expensivegoodsapplication.setIncludeInvoiceItems(1); - expensivegoodsapplication.setIncludeRecyclingItems(0); - expensivegoodsapplication.setSequence(supplyRoomConfigManager.getOrgUnitSequence(expensivegoodsapplication.getDepartCoding())); - expensivegoodsapplication.setType(InvoicePlan.TYPE_EXPENSIVEGOODS_FORM); + expensiveGoodsApplication.setCommittedStatus(commit); + expensiveGoodsApplication.setOrderByFiled(InvoicePlan.ORDERBYFIELD_ONE); + expensiveGoodsApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); + expensiveGoodsApplication.setIncludeInvoiceItems(1); + expensiveGoodsApplication.setIncludeRecyclingItems(0); + expensiveGoodsApplication.setSequence(supplyRoomConfigManager.getOrgUnitSequence(expensiveGoodsApplication.getDepartCoding())); + expensiveGoodsApplication.setType(InvoicePlan.TYPE_EXPENSIVEGOODS_FORM); //设置五笔码和拼音码 - String depart = expensivegoodsapplication.getDepart(); - expensivegoodsapplication.setSpelling(GB2Alpha.string2Alpha(depart)); - expensivegoodsapplication.setWbCode(GB2WB.getWBCode(depart)); - objectDao.saveOrUpdate(expensivegoodsapplication); + String depart = expensiveGoodsApplication.getDepart(); + expensiveGoodsApplication.setSpelling(GB2Alpha.string2Alpha(depart)); + expensiveGoodsApplication.setWbCode(GB2WB.getWBCode(depart)); + objectDao.saveOrUpdate(expensiveGoodsApplication); } else { throw new RuntimeException("申请项不能为空！"); } } /** * 设置高值耗材的申请项. - * @param expensivegoodsapplication 高值耗材申请单对象 + * @param expensiveGoodsApplication 高值耗材申请单对象 * @param items 此次提交的申请项 */ - private void setTousseItem(Expensivegoodsapplication expensivegoodsapplication, JSONArray items) { - if (expensivegoodsapplication == null || CollectionUtils.isEmpty(items)) { + private void setTousseItem(ExpensiveGoodsApplication expensiveGoodsApplication, JSONArray items) { + if (expensiveGoodsApplication == null || CollectionUtils.isEmpty(items)) { throw new RuntimeException("参数异常！"); } - List oldApplicationItems = expensivegoodsapplication.getApplicationItems(); //旧的申请项集合 + List oldApplicationItems = expensiveGoodsApplication.getApplicationItems(); //旧的申请项集合 List newApplicationItems = new ArrayList(); //新的申请项集合 for (Object object : items) { JSONObject jsonObj = (JSONObject) object; @@ -111,8 +111,8 @@ tousseItem.setPrice(jsonObj.optDouble("referencePrice")); //高值耗材的参考价 tousseItem.setTousseType(ExpensiveGoods.TYPE_NAME); tousseItem.setDiposable(com.forgon.Constants.STR_NO); - tousseItem.setInvoicePlan(expensivegoodsapplication); - tousseItem.setInvoicePlanID(expensivegoodsapplication.getId()); + tousseItem.setInvoicePlan(expensiveGoodsApplication); + tousseItem.setInvoicePlanID(expensiveGoodsApplication.getId()); objectDao.save(tousseItem); } tousseItem.setAmount(jsonObj.optInt("amount")); @@ -128,29 +128,29 @@ objectDao.delete(TousseItem.class.getSimpleName(), oldApplicationItemIds); } } - expensivegoodsapplication.setApplicationItems(newApplicationItems); + expensiveGoodsApplication.setApplicationItems(newApplicationItems); } @Override public void updateExpensiveGoodsApplicationForApproval( - Expensivegoodsapplication expensivegoodsapplication, JSONArray items) { - setTousseItem(expensivegoodsapplication, items); + ExpensiveGoodsApplication expensiveGoodsApplication, JSONArray items) { + setTousseItem(expensiveGoodsApplication, items); } @Override - public void updateNodeInfo(Expensivegoodsapplication expensivegoodsapplication, boolean approval) { - if (expensivegoodsapplication == null) { + public void updateNodeInfo(ExpensiveGoodsApplication expensiveGoodsApplication, boolean approval) { + if (expensiveGoodsApplication == null) { throw new RuntimeException("参数异常！"); } if (approval) { } else { - boolean committedStatus = Boolean.valueOf(expensivegoodsapplication.getCommittedStatus()); + boolean committedStatus = Boolean.valueOf(expensiveGoodsApplication.getCommittedStatus()); if (committedStatus) { - expensivegoodsapplication.setProcessStatus(Expensivegoodsapplication.PROCESSSTATUS_NOT_STARTED); - expensivegoodsapplication.setCurrentNodeDefinitionId(null); - expensivegoodsapplication.setCurrentNodeDefinitionName(null); + expensiveGoodsApplication.setProcessStatus(ExpensiveGoodsApplication.PROCESSSTATUS_NOT_STARTED); + expensiveGoodsApplication.setCurrentNodeDefinitionId(null); + expensiveGoodsApplication.setCurrentNodeDefinitionName(null); } } } Fisheye: Tag 21801 refers to a dead (removed) revision in file `ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/Expensivegoodsapplication.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/Expensivegoodsapplication.java =================================================================== diff -u -r21788 -r21801 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/Expensivegoodsapplication.java (.../Expensivegoodsapplication.java) (revision 21788) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/Expensivegoodsapplication.java (.../ExpensiveGoodsApplication.java) (revision 21801) @@ -16,7 +16,7 @@ */ @Entity @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) -public class Expensivegoodsapplication extends InvoicePlan { +public class ExpensiveGoodsApplication extends InvoicePlan { /** * 住院号 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java =================================================================== diff -u -r21800 -r21801 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 21800) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 21801) @@ -10,7 +10,7 @@ import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; -import com.forgon.disinfectsystem.entity.expensivegoodsapplication.Expensivegoodsapplication; +import com.forgon.disinfectsystem.entity.expensivegoodsapplication.ExpensiveGoodsApplication; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.expensivegoodsapplication.service.ExpensiveGoodsApplicationManager; import com.forgon.tools.StrutsParamUtils; @@ -30,9 +30,9 @@ @Namespace(value = "/disinfectSystem/expensivegoodsapplication") @Action(value = "expensiveGoodsApplicationAction") public class ExpensiveGoodsApplicationAction implements Preparable, -ModelDriven{ +ModelDriven{ - private Expensivegoodsapplication expensivegoodsapplication; + private ExpensiveGoodsApplication expensiveGoodsApplication; private ExpensiveGoodsApplicationManager expensiveGoodsApplicationManager; @@ -43,17 +43,17 @@ } @Override - public Expensivegoodsapplication getModel() { - return expensivegoodsapplication; + public ExpensiveGoodsApplication getModel() { + return expensiveGoodsApplication; } @Override public void prepare() throws Exception { Long id = StrutsParamUtils.getPraramLongValue("id", 0L); if (DatabaseUtil.isPoIdValid(id)) { - expensivegoodsapplication = expensiveGoodsApplicationManager.get(id); + expensiveGoodsApplication = expensiveGoodsApplicationManager.get(id); } else { - expensivegoodsapplication = new Expensivegoodsapplication(); + expensiveGoodsApplication = new ExpensiveGoodsApplication(); } } @@ -69,8 +69,8 @@ try { JSONArray items = JSONArray.fromObject(tousseItems); //重新设置手术时间 - expensivegoodsapplication.setOperationTime(ForgonDateUtils.safelyParseDate(StrutsParamUtils.getPraramValue("operationTime", ""))); - expensiveGoodsApplicationManager.saveOrUpdate(expensivegoodsapplication, commit, items); + expensiveGoodsApplication.setOperationTime(ForgonDateUtils.safelyParseDate(StrutsParamUtils.getPraramValue("operationTime", ""))); + expensiveGoodsApplicationManager.saveOrUpdate(expensiveGoodsApplication, commit, items); } catch (Exception e) { e.printStackTrace(); result = JSONUtil.buildJsonObject(false, e.getMessage()); @@ -90,7 +90,7 @@ JSONObject result = JSONUtil.buildJsonObject(true, "保存成功"); try { JSONArray items = JSONArray.fromObject(tousseItems); - expensiveGoodsApplicationManager.updateExpensiveGoodsApplicationForApproval(expensivegoodsapplication, items); + expensiveGoodsApplicationManager.updateExpensiveGoodsApplicationForApproval(expensiveGoodsApplication, items); } catch (Exception e) { e.printStackTrace(); result = JSONUtil.buildJsonObject(false, e.getMessage()); @@ -106,51 +106,51 @@ */ public void loadExpensiveGoodsApplication() { JSONObject result = JSONUtil.buildJsonObject(false, "找不到对应的申请单！"); - if (expensivegoodsapplication != null && DatabaseUtil.isPoIdValid(expensivegoodsapplication.getId())) { + if (expensiveGoodsApplication != null && DatabaseUtil.isPoIdValid(expensiveGoodsApplication.getId())) { result = JSONUtil.buildJsonObject(true, "加载成功！"); - result.put("data", buildRecyclingApplicationJson(expensivegoodsapplication)); + result.put("data", buildRecyclingApplicationJson(expensiveGoodsApplication)); } StrutsResponseUtils.output(result); } /** * - * @param expensivegoodsapplication + * @param expensiveGoodsApplication * @return */ - private String buildRecyclingApplicationJson(Expensivegoodsapplication expensivegoodsapplication) { + private String buildRecyclingApplicationJson(ExpensiveGoodsApplication expensiveGoodsApplication) { JSONObject obj = new JSONObject(); - obj.put("id", expensivegoodsapplication.getId()); - obj.put("depart", expensivegoodsapplication.getDepart()); - obj.put("departCoding", expensivegoodsapplication.getDepartCoding()); - obj.put("settleAccountsDepart", expensivegoodsapplication.getSettleAccountsDepart()); - obj.put("settleAccountsDepartCoding", expensivegoodsapplication.getSettleAccountsDepartCoding()); - obj.put("handleDepart", expensivegoodsapplication.getHandleDepart()); - obj.put("handleDepartCoding", expensivegoodsapplication.getHandleDepartCoding()); - obj.put("serialNumber", expensivegoodsapplication.getSerialNumber()); - obj.put("applicant", expensivegoodsapplication.getApplicant()); - obj.put("applicationTimeStr", expensivegoodsapplication.getApplicationTimeStr()); - obj.put("remark", expensivegoodsapplication.getRemark()); - obj.put("deliverStatus", expensivegoodsapplication.getDeliverStatus()); + obj.put("id", expensiveGoodsApplication.getId()); + obj.put("depart", expensiveGoodsApplication.getDepart()); + obj.put("departCoding", expensiveGoodsApplication.getDepartCoding()); + obj.put("settleAccountsDepart", expensiveGoodsApplication.getSettleAccountsDepart()); + obj.put("settleAccountsDepartCoding", expensiveGoodsApplication.getSettleAccountsDepartCoding()); + obj.put("handleDepart", expensiveGoodsApplication.getHandleDepart()); + obj.put("handleDepartCoding", expensiveGoodsApplication.getHandleDepartCoding()); + obj.put("serialNumber", expensiveGoodsApplication.getSerialNumber()); + obj.put("applicant", expensiveGoodsApplication.getApplicant()); + obj.put("applicationTimeStr", expensiveGoodsApplication.getApplicationTimeStr()); + obj.put("remark", expensiveGoodsApplication.getRemark()); + obj.put("deliverStatus", expensiveGoodsApplication.getDeliverStatus()); - obj.put("hospitalNumber", expensivegoodsapplication.getHospitalNumber()); - obj.put("clinicNumber", expensivegoodsapplication.getClinicNumber()); - obj.put("patient", expensivegoodsapplication.getPatient()); - obj.put("patientArea", expensivegoodsapplication.getPatientArea()); - obj.put("roomNumber", expensivegoodsapplication.getRoomNumber()); - obj.put("bedNumber", expensivegoodsapplication.getBedNumber()); - obj.put("patientAge", expensivegoodsapplication.getPatientAge()); - obj.put("patientSex", expensivegoodsapplication.getPatientSex()); - obj.put("ascriptionDepartment", expensivegoodsapplication.getAscriptionDepartment()); - obj.put("surgery", expensivegoodsapplication.getSurgery()); - obj.put("operationTime", ForgonDateUtils.safelyFormatDate(expensivegoodsapplication.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - obj.put("doctor", expensivegoodsapplication.getDoctor()); - obj.put("operationRoom", expensivegoodsapplication.getOperationRoom()); - obj.put("committedStatus", expensivegoodsapplication.getCommittedStatus()); + obj.put("hospitalNumber", expensiveGoodsApplication.getHospitalNumber()); + obj.put("clinicNumber", expensiveGoodsApplication.getClinicNumber()); + obj.put("patient", expensiveGoodsApplication.getPatient()); + obj.put("patientArea", expensiveGoodsApplication.getPatientArea()); + obj.put("roomNumber", expensiveGoodsApplication.getRoomNumber()); + obj.put("bedNumber", expensiveGoodsApplication.getBedNumber()); + obj.put("patientAge", expensiveGoodsApplication.getPatientAge()); + obj.put("patientSex", expensiveGoodsApplication.getPatientSex()); + obj.put("ascriptionDepartment", expensiveGoodsApplication.getAscriptionDepartment()); + obj.put("surgery", expensiveGoodsApplication.getSurgery()); + obj.put("operationTime", ForgonDateUtils.safelyFormatDate(expensiveGoodsApplication.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + obj.put("doctor", expensiveGoodsApplication.getDoctor()); + obj.put("operationRoom", expensiveGoodsApplication.getOperationRoom()); + obj.put("committedStatus", expensiveGoodsApplication.getCommittedStatus()); //设置申请项 JSONArray items = new JSONArray(); - List applicationItems = expensivegoodsapplication.getApplicationItems(); + List applicationItems = expensiveGoodsApplication.getApplicationItems(); if (CollectionUtils.isNotEmpty(applicationItems)) { for (TousseItem tousseItem : applicationItems) { JSONObject item = new JSONObject();